update cart view
fix merge conflict