add shop cart
conflict fixed