Correction of previous merge