Updated .gitignore
Merge conflict