diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 443345e..514e3ff 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -20,8 +20,23 @@
               "icon": "lucide-file",
               "title": "机器学习"
             }
+          },
+          {
+            "id": "48f57e8f2e41e481",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "conflict-files-obsidian-git"
+            }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -178,9 +193,10 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "ee6712e4bb96f904",
+  "active": "48f57e8f2e41e481",
   "lastOpenFiles": [
     "超级备忘/机器学习/机器学习.md",
+    "conflict-files-obsidian-git.md",
     "超级备忘/课内备忘/课表.md",
     "超级备忘/机器学习",
     "零碎的知识/嵌入式实验室设备使用指南.md",
@@ -192,7 +208,6 @@
     "个人日记/2026.3.8.md",
     "个人日记/2026-03-09.md",
     "个人日记/2026-03-08.md",
-    "conflict-files-obsidian-git.md",
     "超级备忘/课内备忘",
     "超级备忘",
     "技能树/观背的饲养/观背的饲养.md",