workspace.xml merge error fix