Update .gitignore

Missed a merge conflict