Modify cart.rb
Merge and modify cat.rb