edit conflicted workspace.xml