edit after merge