bad mnerge xml fix