Clean after merge