Fixing merge between old cart and new cart