Hm git must have auto-merged these then.  So, if I just delete lines 528-605 we should be back at the version on master?