Remove conflict in .gitignore