diff --git a/detection/__main__.py b/detection/__main__.py
index f179285..c620c8e 100644
--- a/detection/__main__.py
+++ b/detection/__main__.py
@@ -388,7 +388,6 @@ def process_path(
             for file_path in Path(path).rglob("*")
             if file_path.suffix in SUPPORTED_EXTENSIONS
         ]
-<<<<<<< HEAD
         if mode == "llm":
             results = GPTdetectFileList(all_files)
         else: