Xml fix, merge problem