cleanup after merge.