FIX: Use merge_id_with_resolved_entity=True

src/caoscrawler/crawl.py

@@ -647,7 +647,8 @@ class Crawler(object):
                     # the same obejct.
                     # We merge the two in order to prevent loss of information
                     try:
-                        merge_entities(newrecord, record, merge_references_with_empty_diffs=False)
+                        merge_entities(
+                            newrecord, record, merge_references_with_empty_diffs=False, merge_id_with_resolved_entity=True)
                     except EntityMergeConflictError:
                         _treat_merge_error_of(newrecord, record)
                         # We cannot merge but it is none of the clear case where merge is
@@ -687,7 +688,8 @@ class Crawler(object):
                 # missing record?)
                 elif self._has_missing_object_in_references(identifiable, referencing_entities):
                     to_be_inserted.append(record)
-                    self.add_to_remote_missing_cache(record, identifiable)
+                    self.add_to_remote_missing_cache(
+                        record, identifiable, merge_id_with_resolved_entity=True)
                     del flat[i]
                     resolved_references = True