Minor changes to .gitignore
Fixed merge conflict in .gitignore