clean up conflict in .gitignore