removed ability to see price, show page, add to cart on root page
conflict fixes
merge fixes from pulling down