Update .gitignore

There was a merge conflict that I think has been resolved.