tidy up after merge