tidy up previous merge