Update .gitignore

Fixed merge conflict contained in push