fix conflicts in .gitignore
fix conflicts in .gitignore