clean up of merge