Removed git merge marker.