Resolved conflict, updated xml