Updated gitignore
Merge conflicts