Remove characters introduced while fixing conflicts.