shopping cart fix, katie help
resolve merge conflicts