cleanup prior to merge