diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 80b4f9a..5be9a27 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -32,9 +32,23 @@
               "icon": "lucide-file",
               "title": "2026-05-11"
             }
+          },
+          {
+            "id": "3e8b525069e84e20",
+            "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
+        "currentTab": 2
       }
     ],
     "direction": "vertical"
@@ -194,10 +208,10 @@
       "pdf-plus:PDF++: Toggle auto-paste": false
     }
   },
-  "active": "8e9bf87d81cab358",
+  "active": "3e8b525069e84e20",
   "lastOpenFiles": [
-    "个人总纲和进度监督/英语六级/2026-05-11/2026-05-11.md",
     "conflict-files-obsidian-git.md",
+    "个人总纲和进度监督/英语六级/2026-05-11/2026-05-11.md",
     "个人总纲和进度监督/英语六级/2026-05-10/2025.12六级听力第1套.mp3",
     "未命名.md",
     "个人日记/2026-05-11.md",