better merge, better check