shopping cart done
conflict resolved