minor fix in shopping cart
merge conflict fixed