Update .gitignore

Fixed merge conflict