Merge conflict in .gitignore