merge workspace.xml
merge workspace.xml