Fixing merge conflicts in project files