Hide empty cart
Add changes
Merge conflicts