names changes after failed merge.