Fix xml file that was butchered by a merge