Remove merge conflict-resolution change

Author: kushalbakshi

element_array_ephys/ephys_acute.py

@@ -180,10 +180,7 @@ def auto_generate_entries(cls, session_key):
                     "probe_type": spikeglx_meta.probe_model,
                     "probe": spikeglx_meta.probe_SN,
                 }
-                if (
-                    probe_key["probe"] not in [p["probe"] for p in probe_list]
-                    and probe_key not in probe.Probe()
-                ):
+                if probe_key["probe"] not in [p["probe"] for p in probe_list]:
                     probe_list.append(probe_key)
 
                 probe_dir = meta_filepath.parent
@@ -207,10 +204,7 @@ def auto_generate_entries(cls, session_key):
                     "probe_type": oe_probe.probe_model,
                     "probe": oe_probe.probe_SN,
                 }
-                if (
-                    probe_key["probe"] not in [p["probe"] for p in probe_list]
-                    and probe_key not in probe.Probe()
-                ):
+                if probe_key["probe"] not in [p["probe"] for p in probe_list]:
                     probe_list.append(probe_key)
                 probe_insertion_list.append(
                     {