solve conflict in .gitignore