Remove characters introduced during merge.