Resolved differences in workspace.xml

as a result of crappy merge