detail page update
resolved merge conflict
added detais to product detail page