Cleanup previous merge