show product, price, qty
position cart link
resolve conflicts with master