Minor modification to .gitignore
Trying to merge conflicts