diff --git a/infra/_3mf_writer/_3mf.py b/infra/_3mf_writer/_3mf.py
index 4cc6047..6e2a5ff 100644
--- a/infra/_3mf_writer/_3mf.py
+++ b/infra/_3mf_writer/_3mf.py
@@ -7,7 +7,14 @@ import xml.etree.ElementTree as ET
 from datetime import date
 from typing import Any
 
+<<<<<<< HEAD
 from ..blender.blender_mesh_capture import SlicingGroup, SlicingCollection
+=======
+try:
+    from ..blender.blender_mesh_capture import SlicingGroup, SlicingCollection
+except ImportError:
+    from ..infra.blender_mesh_capture import SlicingGroup, SlicingCollection
+>>>>>>> 9d282dee016bdbc10e4529120ee4e3faedbe6685
 
 script_dir = os.path.dirname(os.path.abspath(__file__))