update cart
merge conflict