clean up the merge