diff --git a/backend/services/intelligence/txtai_service.py b/backend/services/intelligence/txtai_service.py
index 6f62d0a8..802e0778 100644
--- a/backend/services/intelligence/txtai_service.py
+++ b/backend/services/intelligence/txtai_service.py
@@ -250,7 +250,6 @@ class TxtaiIntelligenceService:
             logger.error(message)
             if self.fail_fast:
                 raise RuntimeError(message)
->>>>>>> 8b0547c (Make SIF fail fast and add low-cost remote LLM fallback)
             return
 
         try: