better merge logic; misc other