add product page
fix conflicts