modification after merge