diff --git a/.aide/flow-status.lock b/.aide/flow-status.lock
deleted file mode 100755
index 9b181f6..0000000
--- a/.aide/flow-status.lock
+++ /dev/null
@@ -1 +0,0 @@
-46068
\ No newline at end of file
diff --git a/aide-program/aide/flow/branch.py b/aide-program/aide/flow/branch.py
index 1f886e2..fec653b 100644
--- a/aide-program/aide/flow/branch.py
+++ b/aide-program/aide/flow/branch.py
@@ -323,12 +323,12 @@ class BranchManager:
         source_branch = branch_info.source_branch
         task_branch = branch_info.branch_name
 
-        # 切换分支前清理 lock 文件，避免冲突
-        self._cleanup_lock_file()
-
         # 切回源分支
         self.git.checkout(source_branch)
 
+        # 切换分支后清理 lock 文件（确保 master 上的 lock 文件也被删除）
+        self._cleanup_lock_file()
+
         # squash 合并任务分支
         self.git.merge_squash(task_branch)
 
@@ -359,12 +359,12 @@ class BranchManager:
         task_branch = branch_info.branch_name
         temp_branch = f"{task_branch}-merge"
 
-        # 切换分支前清理 lock 文件，避免冲突
-        self._cleanup_lock_file()
-
         # 从起始提交检出临时分支
         self.git.checkout_new_branch(temp_branch, start_commit)
 
+        # 切换分支后清理 lock 文件
+        self._cleanup_lock_file()
+
         # 在临时分支执行 squash 合并
         self.git.merge_squash(task_branch)