Clean up after merge.