diff --git a/.obsidian/community-plugins.json b/.obsidian/community-plugins.json
index 574a981..e129891 100644
--- a/.obsidian/community-plugins.json
+++ b/.obsidian/community-plugins.json
@@ -2,10 +2,7 @@
   "obsidian-git",
   "obsidian-tasks-plugin",
   "pdf-plus",
-<<<<<<< HEAD
+  "tasks-calendar-wrapper",
   "advanced-canvas",
-  "obsidian-plantuml",
-=======
->>>>>>> origin/main
-  "tasks-calendar-wrapper"
+  "obsidian-plantuml"
 ]
\ No newline at end of file
diff --git a/部门五月份任务规划.md b/部门五月份任务规划.md
index f1adbf6..69d7560 100644
--- a/部门五月份任务规划.md
+++ b/部门五月份任务规划.md
@@ -65,7 +65,7 @@
 
 #### 交付物
 
-- [x] 原型机硬件问题清单 ✅ 2026-05-09
+- [x] 原型机硬件问题清单 ✅ 2026-05-10
 - [ ] 新版原理图修改需求清单
 - [ ] 新版原理图 V1
 - [ ] 原型机硬件问题修复对照表