repair of previous merge