Fixed issue about xsd and wrong merge