diff --git a/.gitignore b/.gitignore
index 90f64cb..2c5d0f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /.obsidian/workspace*.*
+*conflict*
diff --git a/.obsidian/community-plugins.sync-conflict-20230716-185619-CALEDER.json b/.obsidian/community-plugins.sync-conflict-20230716-185619-CALEDER.json
deleted file mode 100644
index 2f90ba1..0000000
--- a/.obsidian/community-plugins.sync-conflict-20230716-185619-CALEDER.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  "obsidian-style-settings",
-  "table-editor-obsidian",
-  "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",
-  "calendar"
-]
\ No newline at end of file