started to refactor xml
fixed conflict