MAINT: Revert changes in crawl.py for merge with f-fix-merge

src/caoscrawler/crawl.py

@@ -602,7 +602,7 @@ class Crawler(object):
                     # We merge the two in order to prevent loss of information
                     newrecord = self.get_from_any_cache(identifiable)
                     try:
-                        merge_entities(newrecord, record, merge_id_with_resolved_entity=True)
+                        merge_entities(newrecord, record)
                     except EntityMergeConflictError:
                         continue
                     Crawler.bend_references_to_new_object(
@@ -639,14 +639,7 @@ class Crawler(object):
                     resolved_references = True
 
             for record in flat:
-                try:
-                    self.replace_references_with_cached(record, referencing_entities)
-                except RuntimeError as re:
-                    # TODO: This resolves
-                    # https://gitlab.indiscale.com/caosdb/customers/leibniz-zmt/management/-/issues/258,
-                    # but why?
-                    print(f"Record: {record}\n")
-                    continue
+                self.replace_references_with_cached(record, referencing_entities)
 
         if len(flat) > 0:
             circle = self.detect_circular_dependency(flat)