diff --git a/backend/config_manager.py b/backend/config_manager.py
index 85bf502..52cd64f 100644
--- a/backend/config_manager.py
+++ b/backend/config_manager.py
@@ -77,8 +77,6 @@ class ConfigManager:
             redis_username = os.getenv('REDIS_USERNAME', None)
             redis_password = os.getenv('REDIS_PASSWORD', None)
             
-<<<<<<< Current (Your changes)
-=======
             # 验证URL格式
             if not redis_url or not isinstance(redis_url, str):
                 logger.warning(f"Redis URL无效: {redis_url}，使用默认值")
@@ -101,7 +99,6 @@ class ConfigManager:
                         redis_url = f"rediss://{redis_url}"
                 logger.info(f"已自动转换Redis URL为TLS格式: {redis_url}")
             
->>>>>>> Incoming (Background Agent changes)
             # 解析Redis URL
             if redis_url.startswith('rediss://') or redis_use_tls:
                 # TLS连接