From f1a01934261800673a216122b1e28dfeced8bbb8 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 2 Apr 2026 23:37:48 +0000
Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 unsloth/models/loader.py | 4 ----
 1 file changed, 4 deletions(-)

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(