add userList for xml
fix conflict
fix conflict