diff --git a/backend/config_manager.py b/backend/config_manager.py
index 9d8a9e1..b982d54 100644
--- a/backend/config_manager.py
+++ b/backend/config_manager.py
@@ -244,13 +244,6 @@ class ConfigManager:
     def get(self, key, default=None):
         """获取配置值"""
         # 1. 优先从Redis缓存读取（最新）
-<<<<<<< Current (Your changes)
-        redis_value = self._get_from_redis(key)
-        if redis_value is not None:
-            # 同时更新本地缓存
-            self._cache[key] = redis_value
-            return redis_value
-=======
         # 注意：只在Redis连接正常时尝试读取，避免频繁连接失败
         if self._redis_connected and self._redis_client:
             redis_value = self._get_from_redis(key)
@@ -258,7 +251,6 @@ class ConfigManager:
                 # 同时更新本地缓存
                 self._cache[key] = redis_value
                 return redis_value
->>>>>>> Incoming (Background Agent changes)
         
         # 2. 从本地缓存读取
         if key in self._cache:
diff --git a/trading_system/position_manager.py b/trading_system/position_manager.py
index 87b6ab4..21ecae2 100644
--- a/trading_system/position_manager.py
+++ b/trading_system/position_manager.py
@@ -411,6 +411,10 @@ class PositionManager:
                         if trade_id and DB_AVAILABLE and Trade:
                             try:
 <<<<<<< Current (Your changes)
+<<<<<<< Current (Your changes)
+=======
+                                from database.connection import db
+>>>>>>> Incoming (Background Agent changes)
 =======
                                 from database.connection import db
 >>>>>>> Incoming (Background Agent changes)