Fixing merge conflicts