From 192fde5c30b467065d78ec0475a907e1ba884470 Mon Sep 17 00:00:00 2001
From: Dan Saunders <danjsaund@gmail.com>
Date: Tue, 17 Dec 2024 13:45:41 +0000
Subject: [PATCH] fix

---
 src/axolotl/cli/main.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/axolotl/cli/main.py b/src/axolotl/cli/main.py
index 5a4c99071..b71179ee5 100644
--- a/src/axolotl/cli/main.py
+++ b/src/axolotl/cli/main.py
@@ -12,11 +12,7 @@
     build_command,
     fetch_from_github,
 )
-<<<<<<< HEAD
 from axolotl.common.cli import ConvertDiffTransformerCliArgs, EvaluateCliArgs, PreprocessCliArgs, TrainerCliArgs
-=======
-from axolotl.common.cli import EvaluateCliArgs, PreprocessCliArgs, TrainerCliArgs
->>>>>>> main
 from axolotl.utils.config.models.input.v0_4_1 import AxolotlInputConfig