add cart
fix merge