Remove merge conflict lines from gitignore