corrections after merge