added individual product pages
fixed merge conflcit