Got rid of merge conflict markers.