Fixing XSD conflict with same namespace
Merge