Cleanup the merge