diff --git a/unsloth/models/mapper.py b/unsloth/models/mapper.py
index 23b956567d..dc54bfd791 100644
--- a/unsloth/models/mapper.py
+++ b/unsloth/models/mapper.py
@@ -90,13 +90,10 @@ __INT_TO_FLOAT_MAPPER = \
         "unsloth/gemma-2b-it",
         "google/gemma-2b-it",
     ),
-<<<<<<< Updated upstream
-=======
     "unsloth/mistral-7b-v0.2-bnb-4bit" : (
         "unsloth/mistral-7b-v0.2",
         "alpindale/Mistral-7B-v0.2-hf",
-    ),
->>>>>>> Stashed changes
+    )
 }
 
 INT_TO_FLOAT_MAPPER = {}