diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index e5865c4..108b18f 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -20,8 +20,23 @@
               "icon": "lucide-file",
               "title": "实验对比"
             }
+          },
+          {
+            "id": "241356f79217b44a",
+            "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"
@@ -177,8 +192,18 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "61794e0c5a3743ba",
+  "active": "241356f79217b44a",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
+    "fusion实验记录/实验对比.md",
+    "rm常用库/c板常用接口.md",
+    "rm常用库/Pasted image 20260205113634.png",
+    "rm常用库/Pasted image 20260205113541.png",
+    "rm常用库/Pasted image 20260205113522.png",
+    "rm常用库/Pasted image 20260205113442.png",
+    "rm常用库/Pasted image 20260205113421.png",
+    "rm常用库/Pasted image 20260204203012.png",
+    "rm常用库",
     "个人日记/2026.3.8.md",
     "零碎的知识/ros1禁用gazebo的gpu功能.md",
     "个人日记",
@@ -194,7 +219,6 @@
     "零碎的知识/数学建模导论 -2025年2月学习笔记.md",
     "零碎的知识/bashrc中设置宏定义.md",
     "零碎的知识/ubuntu新建用户.md",
-    "fusion实验记录/实验对比.md",
     "fusion实验记录/D0D85410",
     "fusion实验记录/CBA93410",
     "fusion实验记录/F0C73410",
@@ -203,7 +227,6 @@
     "fusion实验记录/F1013410",
     "fusion实验记录/51013410",
     "fusion实验记录/3FF03410",
-    "fusion实验记录/CEF03410",
     "零碎的知识/eda踩雷记录.md",
     "零碎的知识/设置代理.md",
     "零碎的知识/嵌入式实验室设备使用指南.md",
@@ -213,12 +236,9 @@
     "个人总纲和进度监督/DEADLINE.md",
     "创建链接.md",
     "欢迎.md",
-    "未命名 1.md",
     "Pasted image 20260204203012.png",
     "Pasted image 20260205113421.png",
     "Pasted image 20260205113522.png",
-    "Pasted image 20260205113541.png",
-    "Pasted image 20260205113442.png",
-    "Pasted image 20260205113634.png"
+    "Pasted image 20260205113541.png"
   ]
 }
\ No newline at end of file
diff --git a/Pasted image 20260204203012.png b/rm常用库/Pasted image 20260204203012.png
similarity index 100%
rename from Pasted image 20260204203012.png
rename to rm常用库/Pasted image 20260204203012.png
diff --git a/Pasted image 20260205113421.png b/rm常用库/Pasted image 20260205113421.png
similarity index 100%
rename from Pasted image 20260205113421.png
rename to rm常用库/Pasted image 20260205113421.png
diff --git a/Pasted image 20260205113442.png b/rm常用库/Pasted image 20260205113442.png
similarity index 100%
rename from Pasted image 20260205113442.png
rename to rm常用库/Pasted image 20260205113442.png
diff --git a/Pasted image 20260205113522.png b/rm常用库/Pasted image 20260205113522.png
similarity index 100%
rename from Pasted image 20260205113522.png
rename to rm常用库/Pasted image 20260205113522.png
diff --git a/Pasted image 20260205113541.png b/rm常用库/Pasted image 20260205113541.png
similarity index 100%
rename from Pasted image 20260205113541.png
rename to rm常用库/Pasted image 20260205113541.png
diff --git a/Pasted image 20260205113634.png b/rm常用库/Pasted image 20260205113634.png
similarity index 100%
rename from Pasted image 20260205113634.png
rename to rm常用库/Pasted image 20260205113634.png
diff --git a/c板常用接口.md b/rm常用库/c板常用接口.md
similarity index 100%
rename from c板常用接口.md
rename to rm常用库/c板常用接口.md
diff --git a/未命名.base b/未命名.base
deleted file mode 100644
index f165474..0000000
--- a/未命名.base
+++ /dev/null
@@ -1,3 +0,0 @@
-views:
-  - type: table
-    name: 表格
diff --git a/演示.md b/演示.md
deleted file mode 100644
index 836376b..0000000
--- a/演示.md
+++ /dev/null
@@ -1 +0,0 @@
-[[设置代理]]
\ No newline at end of file