resolve conflicts
add workxml
dd
wospace.xml