fixed missing cart bug
merge conflict