Finish previous merge