repair previous merge