diff --git a/ceasiompy/CPACS2GMSH/func/RANS_mesh_generator.py b/ceasiompy/CPACS2GMSH/func/RANS_mesh_generator.py
index 10db511c9..21321ca00 100644
--- a/ceasiompy/CPACS2GMSH/func/RANS_mesh_generator.py
+++ b/ceasiompy/CPACS2GMSH/func/RANS_mesh_generator.py
@@ -226,15 +226,8 @@ def bounding_box_distance(bbox1, bbox2):
             bounding_boxes["fused"] = new_bbox
 
             fused = True
-<<<<<<< HEAD
-            log.info(
-                f"Fused entities {i} and {j} with distance {min_distance}. "
-                f"Remaining entities: {len(parts_parent_dimtag)}"
-            )
-=======
             log.info(f"Fused entities {i} and {j} with distance {min_distance}")
             log.info(f"Remaining entities: {len(parts_parent_dimtag)}")
->>>>>>> 57163063f6010d41c2e6dcb5090383f12bae6fd9
 
         except Exception as e:
             log.error(f"Fusion failed for entities {i} and {j}: {e}")