Update .gitignore

fixed merge conflict