diff --git a/.obsidian/community-plugins.json b/.obsidian/community-plugins.json
index 641a2f5..28644d0 100644
--- a/.obsidian/community-plugins.json
+++ b/.obsidian/community-plugins.json
@@ -20,15 +20,10 @@
   "obsidian-mind-map",
   "cm-chs-patch",
   "quickadd",
-<<<<<<< HEAD
-  "highlightr-plugin",
-  "obsidian-git"
-=======
   "any-block",
   "obsidian-opencode",
   "opencode-obsidian",
   "highlightr-plugin",
   "code-styler",
   "note-buddy"
->>>>>>> main/main
 ]
\ No newline at end of file