Muck around with merge code a bit