new edit after merge