Product Dedails Page latest changes
merge conflict