diff --git a/trading_system/position_manager.py b/trading_system/position_manager.py
index 21ecae2..8b9b4bd 100644
--- a/trading_system/position_manager.py
+++ b/trading_system/position_manager.py
@@ -410,14 +410,7 @@ 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)
                                 db.execute_update(
                                     "UPDATE trades SET status = 'cancelled' WHERE id = %s",
                                     (trade_id,)