# Conflicts:
#	app/controllers/carts_controller.rb
#	app/controllers/orders_controller.rb
#	app/controllers/product_items_controller.rb
#	app/helpers/carts_helper.rb
#	app/models/order.rb
#	app/services/cart.rb
#	app/views/carts/_product_item.html.erb
#	db/schema.rb