Removed merge conflict markers.