diff --git a/unsloth/models/loader.py b/unsloth/models/loader.py
index 044d3cdbf2..0bc0ae719c 100644
--- a/unsloth/models/loader.py
+++ b/unsloth/models/loader.py
@@ -1555,10 +1555,6 @@ class FastModel(FastBaseModel):
 
             if _clippable_linear_cls is not None:
                 from peft.tuners.lora.model import LoraModel as _LoraModel
-<<<<<<< HEAD
-
-=======
->>>>>>> 35ebf398 (fix: patch PEFT for Gemma4ClippableLinear in loader checkpoint path)
                 _original_car = _LoraModel._create_and_replace
 
                 def _patched_car(