Undo changes made by previous merge