removing merge conflict markers.