after merge edit