various minor changes
conflict resolve
conflict resolve
revised r-get-bids and s-respond-bids
conflict resolution