merge conflict in product index
-updated product index