update cart
merge conflicts