diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 98f2bf03..c7f6d5c2 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -11,10 +11,14 @@
             "id": "29487c06895fa7d6",
             "type": "leaf",
             "state": {
-              "type": "empty",
-              "state": {},
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              },
               "icon": "lucide-file",
-              "title": "新标签页"
+              "title": "conflict-files-obsidian-git"
             }
           }
         ]
@@ -90,12 +94,13 @@
             "state": {
               "type": "outline",
               "state": {
+                "file": "conflict-files-obsidian-git.md",
                 "followCursor": false,
                 "showSearch": false,
                 "searchQuery": ""
               },
               "icon": "lucide-list",
-              "title": "大纲"
+              "title": "conflict-files-obsidian-git 的大纲"
             }
           },
           {
@@ -153,11 +158,12 @@
               "title": "Source Control"
             }
           }
-        ]
+        ],
+        "currentTab": 4
       }
     ],
     "direction": "horizontal",
-    "width": 200
+    "width": 483.5
   },
   "left-ribbon": {
     "hiddenItems": {
@@ -170,10 +176,10 @@
       "hidden-folder-obsidian:显示文件夹": false
     }
   },
-  "active": "07b0a90e46430bb4",
+  "active": "27878581586f2143",
   "lastOpenFiles": [
-    "SanPinPLM/相关操作/0.SETOUT/12.服务端安装、端口设置.md",
     "conflict-files-obsidian-git.md",
+    "SanPinPLM/相关操作/0.SETOUT/12.服务端安装、端口设置.md",
     "SanPinPLM/相关操作/0.SETOUT/10.数据库安装.md",
     "SanPinPLM/数据库/数据库.md",
     "SanPinPLM/简略教程/外邮通知教程.md",