Merged main data.xml with editor's