Working on removing items from cart
Resolving conflicts