Fixing version conflicts