Improve canonical form of the XML file to avoid conflicts