Patch-Algolia_Algoliasearch-1.12.1-Amasty-conflict-resolve.patch

--- etc/frontend/di.xml	2019-10-30 16:57:04.000000000 +0300
+++ etc/frontend/di.xml	2019-11-11 16:10:09.077000000 +0300
@@ -30,7 +30,7 @@
         </arguments>
     </type>
 
-    <virtualType name="categoryFilterList" type="Magento\Catalog\Model\Layer\FilterList">
+    <virtualType name="algoliaCategoryFilterList" type="Magento\Catalog\Model\Layer\FilterList">
         <arguments>
             <argument name="filterableAttributes" xsi:type="object">Algolia\AlgoliaSearch\Model\Layer\Category\FilterableAttributeList</argument>
             <argument name="filters" xsi:type="array">
@@ -42,7 +42,7 @@
         </arguments>
     </virtualType>
 
-    <virtualType name="searchFilterList" type="Magento\Catalog\Model\Layer\FilterList">
+    <virtualType name="algoliaSearchFilterList" type="Magento\Catalog\Model\Layer\FilterList">
         <arguments>
             <argument name="filterableAttributes" xsi:type="object">Algolia\AlgoliaSearch\Model\Layer\Search\FilterableAttributeList</argument>
             <argument name="filters" xsi:type="array">
@@ -56,19 +56,16 @@
 
     <virtualType name="Algolia\AlgoliaSearch\Block\Navigation\Category" type="Algolia\AlgoliaSearch\Block\Navigation">
         <arguments>
-            <argument name="filterList" xsi:type="object">categoryFilterList</argument>
+            <argument name="filterList" xsi:type="object">algoliaCategoryFilterList</argument>
         </arguments>
     </virtualType>
 
     <virtualType name="Algolia\AlgoliaSearch\Block\Navigation\Search" type="Algolia\AlgoliaSearch\Block\Navigation">
         <arguments>
-            <argument name="filterList" xsi:type="object">searchFilterList</argument>
+            <argument name="filterList" xsi:type="object">algoliaSearchFilterList</argument>
         </arguments>
     </virtualType>
 
-    <preference for="Magento\LayeredNavigation\Block\Navigation\Category" type="Algolia\AlgoliaSearch\Block\Navigation\Category" />
-    <preference for="Magento\LayeredNavigation\Block\Navigation\Search" type="Algolia\AlgoliaSearch\Block\Navigation\Search" />
-
     <type name="Magento\LayeredNavigation\Block\Navigation\FilterRenderer">
         <plugin name="algolia_layered_renderer" type="Algolia\AlgoliaSearch\Plugin\BackendFilterRendererPlugin" sortOrder="0" />
     </type>