Resolved merge conflict

armarx_memory/aron/common/framed/__init__.py

-#from __future__ import annotations
+# Using classes in the type annotations of their own methods can be re-introduced once this import is compatible
+# (>= python 3.7) or native support is ready
+# from __future__ import annotations
+
 
 import dataclasses as dc
 import numpy as np
@@ -46,7 +49,7 @@ class FramedPose(AronDataclass):
     pose: np.ndarray = dc.field(default_factory=lambda: np.eye(4, dtype=np.float32))
 
     @classmethod
-    def with_type_check(cls, header: FrameID, pose: np.ndarray) -> FramedPose:
+    def with_type_check(cls, header: FrameID, pose: np.ndarray) -> 'FramedPose':
         """
         Ensures that the data type of the pose array is correct; otherwise, there might be problems when reading
         the memory from C++