repair, cleanup after merge