house keeping after merge