Remove extraneous merge conflict artifacts.