diff --git a/.obsidian/app.json b/.obsidian/app.json
index 700ff017..9e26dfee 100644
--- a/.obsidian/app.json
+++ b/.obsidian/app.json
@@ -1,14 +1 @@
-{
-  "newFileLocation": "current",
-  "newLinkFormat": "relative",
-  "attachmentFolderPath": "./assets",
-  "strictLineBreaks": true,
-  "useMarkdownLinks": true,
-  "showLineNumber": false,
-<<<<<<< HEAD
-  "trashOption": "local"
-=======
-  "trashOption": "local",
-  "alwaysUpdateLinks": true
->>>>>>> origin/main
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/.obsidian/appearance.json b/.obsidian/appearance.json
index cbcc0c96..9e26dfee 100644
--- a/.obsidian/appearance.json
+++ b/.obsidian/appearance.json
@@ -1,10 +1 @@
-{
-  "nativeMenus": true,
-  "cssTheme": "ITS Theme",
-<<<<<<< HEAD
-  "accentColor": ""
-=======
-  "accentColor": "",
-  "theme": "obsidian"
->>>>>>> origin/main
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/.obsidian/community-plugins.json b/.obsidian/community-plugins.json
index 54774968..e8b2857f 100644
--- a/.obsidian/community-plugins.json
+++ b/.obsidian/community-plugins.json
@@ -1,17 +1,4 @@
 [
-  "consistent-attachments-and-links",
-  "nuke-orphans",
-  "hidden-folder-obsidian",
-  "update-relative-links",
-<<<<<<< HEAD
   "easy-typing-obsidian",
-  "file-explorer-note-count",
-  "obsidian-git",
-  "better-export-pdf"
-=======
-  "better-export-pdf",
-  "easy-typing-obsidian",
-  "file-explorer-note-count",
-  "obsidian-git"
->>>>>>> origin/main
+  "file-explorer-note-count"
 ]
\ No newline at end of file
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index b1ad94bc..651c480f 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -98,16 +98,6 @@
               "title": "大纲"
             }
           },
-          {
-            "id": "27878581586f2143",
-            "type": "leaf",
-            "state": {
-              "type": "git-view",
-              "state": {},
-              "icon": "git-pull-request",
-              "title": "Source Control"
-            }
-          },
           {
             "id": "8c0ffde16d40f63b",
             "type": "leaf",
@@ -141,8 +131,7 @@
               "title": "21.项目类权限详解 的出链列表"
             }
           }
-        ],
-        "currentTab": 1
+        ]
       }
     ],
     "direction": "horizontal",
@@ -153,12 +142,10 @@
       "switcher:打开快速切换": true,
       "graph:查看关系图谱": false,
       "daily-notes:打开/创建今天的日记": true,
-      "command-palette:打开命令面板": false,
-      "obsidian-git:Open Git source control": false,
-      "hidden-folder-obsidian:显示文件夹": false
+      "command-palette:打开命令面板": false
     }
   },
-  "active": "27878581586f2143",
+  "active": "07b0a90e46430bb4",
   "lastOpenFiles": [
     "SanPinPLM/相关操作/1.EDM/3.文档命名唯一性设置.md",
     "conflict-files-obsidian-git.md",