Resolved conflicts with pull
add workspace.xml