edit workspace.xml
merge