working on shopping cart
merge