cleaning up after merge