Remove merge conflict markers