remove remnants from the merge conflict