correction of previous failed merge