Fixed .gitignore file
Merge conflict resolved