diff --git a/qim3d/__init__.py b/qim3d/__init__.py
index 011b64ff105f2ebd80e7ea6c377540725a314785..119a2f42c20d0f3a9ffe3ff1e6466bb5d7e323e9 100644
--- a/qim3d/__init__.py
+++ b/qim3d/__init__.py
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 """qim3d: A Python package for 3D image processing and visualization.
 
 The qim3d library is designed to make it easier to work with 3D imaging data in Python.