diff --git a/src/agent_loop.py b/src/agent_loop.py
index f4879edc5..368ad3211 100644
--- a/src/agent_loop.py
+++ b/src/agent_loop.py
@@ -12,11 +12,7 @@ import json
 import re
 import time
 import logging
-<<<<<<< HEAD
 from typing import Any, AsyncGenerator, Dict, List, Optional, Set
-=======
-from typing import Any, AsyncGenerator, List, Dict, Optional, Set
->>>>>>> upstream/dev
 from urllib.parse import urlparse
 
 from src.llm_core import (