Cleanup after the merge.