diff --git a/resources/definitions/deltacomb_base.def.json b/resources/definitions/deltacomb_base.def.json
index 82a3c28bed..4d5840c9ef 100644
--- a/resources/definitions/deltacomb_base.def.json
+++ b/resources/definitions/deltacomb_base.def.json
@@ -68,11 +68,7 @@
         "travel_avoid_distance":             { "value": "1" },
         "retraction_hop_only_when_collides": { "value": "1" },
 
-<<<<<<< HEAD
-        "switch_extruder_retraction_amount": { "default_value": 5, "value": "5" },
-=======
         "switch_extruder_retraction_amount": { "default_value": 5 },
->>>>>>> 825e9932b... - Deltacomb : Full supporto for dual extruders
         "switch_extruder_retraction_speeds": { "default_value": 70 },
 
         "top_bottom_thickness":            { "default_value": 0.8 },