Remove merge conflict lines from gitignore file

There are lines from a merge conflict in the gitignore file.