Fixed asynchronicity in xml call
fixed merge conflicts