Add cart and cart_items, test user cart interaction
fix merge conflicts