correct previous merge