removed merge conflict markers in .gitignore