fix shopping cart:
merge