Merge "use "" instead of "None" in xml file"