Resolve conflict with workspace.xml

Resolve conflict with workspace.xml