Cleanup after merge.