fixed add_to_cart method
fixed merge conflict