changes in cart
resolved conflict