A better merge