diff --git a/.obsidian/community-plugins.json b/.obsidian/community-plugins.json
index e1d9519..574a981 100644
--- a/.obsidian/community-plugins.json
+++ b/.obsidian/community-plugins.json
@@ -2,7 +2,10 @@
   "obsidian-git",
   "obsidian-tasks-plugin",
   "pdf-plus",
+<<<<<<< HEAD
   "advanced-canvas",
   "obsidian-plantuml",
+=======
+>>>>>>> origin/main
   "tasks-calendar-wrapper"
 ]
\ No newline at end of file
diff --git a/.obsidian/workspace-mobile.json b/.obsidian/workspace-mobile.json
index 3f5cae1..22c18e0 100644
--- a/.obsidian/workspace-mobile.json
+++ b/.obsidian/workspace-mobile.json
@@ -4,11 +4,11 @@
     "type": "split",
     "children": [
       {
-        "id": "c246e3e2b22a59e4",
+        "id": "5e50d6a31ef84854",
         "type": "tabs",
         "children": [
           {
-            "id": "2b7762a761440e79",
+            "id": "dc808fbb98521fba",
             "type": "leaf",
             "state": {
               "type": "markdown",
@@ -182,10 +182,10 @@
       "pdf-plus:PDF++: Toggle auto-paste": false
     }
   },
-  "active": "2b7762a761440e79",
+  "active": "dc808fbb98521fba",
   "lastOpenFiles": [
+    "部门五月份任务规划.md",
     "/部门五月份任务规划.md",
-    "诀别书钢琴谱.pdf",
-    "部门五月份任务规划.md"
+    "诀别书钢琴谱.pdf"
   ]
 }
\ No newline at end of file
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 042cbd7..633bd48 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -94,7 +94,6 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "部门五月份任务规划.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -104,7 +103,7 @@
                 "unlinkedCollapsed": true
               },
               "icon": "links-coming-in",
-              "title": "部门五月份任务规划 的反向链接列表"
+              "title": "反向链接"
             }
           },
           {
@@ -113,12 +112,11 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "部门五月份任务规划.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               },
               "icon": "links-going-out",
-              "title": "部门五月份任务规划 的出链列表"
+              "title": "出链"
             }
           },
           {
@@ -156,13 +154,13 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "部门五月份任务规划.md",
+                "file": "conflict-files-obsidian-git.md",
                 "followCursor": false,
                 "showSearch": false,
                 "searchQuery": ""
               },
               "icon": "lucide-list",
-              "title": "部门五月份任务规划 的大纲"
+              "title": "conflict-files-obsidian-git 的大纲"
             }
           },
           {
@@ -197,6 +195,9 @@
       "pdf-plus:PDF++: Toggle auto-paste": false
     }
   },
-  "active": "b0ba3684f585064f",
-  "lastOpenFiles": []
+  "active": "2076822cdefbb8a3",
+  "lastOpenFiles": [
+    "部门五月份任务规划.md",
+    "conflict-files-obsidian-git.md"
+  ]
 }
\ No newline at end of file
diff --git a/部门五月份任务规划.md b/部门五月份任务规划.md
index f06c13f..f1adbf6 100644
--- a/部门五月份任务规划.md
+++ b/部门五月份任务规划.md
@@ -1,7 +1,7 @@
 
 ## 一、规划背景
 
-当前五月份实际可用于开发和联调的时间只剩下3周，其中**第一周为假期，不进行正式任务规划**。因此本规划重点安排五月第二周和第三周的工作，并面向 **6 月末下水测试** 进行倒排。
+当前五月份实际可用于开发和联调的时间只剩下三周，其中**第一周为假期，不进行正式任务规划**。因此本规划重点安排五月第二周和第三周的工作，并面向 **6 月末下水测试** 进行倒排。
 
 当前已完成或已具备的基础如下：