workspace added
conflict satisfied