storing changes
removed conflicts in the cart chow
added shipping