small changes to xmlparser
fixing merge conflict