diff --git a/notes/conflict-files-obsidian-git.md b/notes/conflict-files-obsidian-git.md
deleted file mode 100644
index 94105c9..0000000
--- a/notes/conflict-files-obsidian-git.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# conflict-files-obsidian-git
-Please resolve them and commit per command (This file will be deleted before the commit).
-- Not a file: notes/.obsidian/plugins/obsidian-activity-history/data.json
\ No newline at end of file