Solve conflicts 3

Author: alejoe91

src/spikeinterface/sorters/internal/spyking_circus2.py

@@ -34,7 +34,7 @@ class Spykingcircus2Sorter(ComponentsBasedSorter):
         "apply_motion_correction": True,
         "motion_correction": {"preset": "dredge_fast"},
         "merging": {"max_distance_um": 50},
-        "clustering": {"method": "circus", "method_kwargs": dict()},
+        "clustering": {"method": "circus-clustering", "method_kwargs": dict(remove_small_snr=True)},
         "matching": {"method": "circus-omp-svd", "method_kwargs": dict(), "gather_mode": "memory"},
         "apply_preprocessing": True,
         "templates_from_svd": True,