diff --git a/.obsidian/community-plugins.sync-conflict-20250422-175448-5FF53Z3.json b/.obsidian/community-plugins.sync-conflict-20250422-175448-5FF53Z3.json
new file mode 100644
index 0000000..862eded
--- /dev/null
+++ b/.obsidian/community-plugins.sync-conflict-20250422-175448-5FF53Z3.json
@@ -0,0 +1,25 @@
+[
+  "obsidian-style-settings",
+  "obsidian-quiet-outline",
+  "obsidian-enhancing-mindmap",
+  "obsidian-auto-link-title",
+  "cm-editor-syntax-highlight-obsidian",
+  "markdown-prettifier",
+  "emoji-shortcodes",
+  "obsidian-emoji-toolbar",
+  "obsidian-enhancing-export",
+  "obsidian-git",
+  "obsidian-pandoc",
+  "dataview",
+  "templater-obsidian",
+  "calendar",
+  "obsidian-tasks-plugin",
+  "periodic-notes",
+  "obsidian-excalidraw-plugin",
+<<<<<<< HEAD
+  "text-snippets-obsidian"
+=======
+  "text-snippets-obsidian",
+  "obsidian-columns"
+>>>>>>> git/main
+]
\ No newline at end of file
diff --git a/.obsidian/~syncthing~community-plugins.sync-conflict-20250422-175448-5FF53Z3.json.tmp b/.obsidian/~syncthing~community-plugins.sync-conflict-20250422-175448-5FF53Z3.json.tmp
deleted file mode 100644
index e6429a8..0000000
Binary files a/.obsidian/~syncthing~community-plugins.sync-conflict-20250422-175448-5FF53Z3.json.tmp and /dev/null differ