Update xml-model-conflict-1.xml