I stupidly checked in these conflict files previously - so now I'm deleting them.