fix conflict in .gitignore