More merge gubbins