diff --git a/flow360/component/simulation/framework/entity_registry.py b/flow360/component/simulation/framework/entity_registry.py
index 7bcfa47a8..637212f13 100644
--- a/flow360/component/simulation/framework/entity_registry.py
+++ b/flow360/component/simulation/framework/entity_registry.py
@@ -56,7 +56,14 @@ def fast_register(self, entity: EntityBase, known_frozen_hashes: set[str]) -> se
         Returns:
             known_frozen_hashes (set[str])
         """
+<<<<<<< HEAD
         if entity.entity_bucket not in self.internal_registry:
+=======
+        if (
+            entity.entity_bucket
+            not in self.internal_registry  # pylint: disable=unsupported-membership-test
+        ):
+>>>>>>> bbce6895 ([Main to 25.5 hotfix] Speed up the loading of the entities by using set and also reduce complexity with supplied known hash set #1316 (#1319))
             # pylint: disable=unsupported-assignment-operation
             self.internal_registry[entity.entity_bucket] = []