[XMLHelper] Add XMLHelper module

Also fixes merge conflict