Remove merge conflict markers.