Fixed merge conflicts

Author: mohitalgolia

Helper/Entity/ProductHelper.php

@@ -469,9 +469,7 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
         }
 
         // Managing Virtual Replica
-        if ($this->configHelper->useVirtualReplica($storeId)) {
-            $replicas = $this->handleVirtualReplica($replicas);
-        }
+        $replicas = $this->handleVirtualReplica($replicas);
 
         // Merge current replicas with sorting replicas to not delete A/B testing replica indices
         try {
@@ -1599,4 +1597,4 @@ public function handlingReplica($indexName, $storeId, $sortingAttribute = false)
         }
         return true;
     }
-}
+}