Clean up after the merge.