adds in stock/out of stock to products show
resolved conflict