Simplify previous merge