diff --git a/.gitignore b/.gitignore
index 186197fc7..276009e6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .obsidian/workspace
 .obsidian/plugins/obsidian-git/data.json
 .obsidian/plugins/
+.obsidian
 *.swp
diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json
index e2b8eec37..fa3f0e42f 100644
--- a/.obsidian/plugins/obsidian-git/data.json
+++ b/.obsidian/plugins/obsidian-git/data.json
@@ -1 +1 @@
-{"commitMessage":"[[snapshot]]: {{date}}","commitDateFormat":"YYYY-MM-DD HH:mm:ss","autoSaveInterval":1,"autoPullInterval":1,"autoPullOnBoot":true,"disablePush":false,"pullBeforePush":true,"disablePopups":false,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Sat May 08 2021 02:03:38 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 02:02:46 GMT+0200 (Central European Summer Time)"}
\ No newline at end of file
+{"commitMessage":"[[snapshot]]: {{date}}","commitDateFormat":"YYYY-MM-DD HH:mm:ss","autoSaveInterval":1,"autoPullInterval":1,"autoPullOnBoot":true,"disablePush":false,"pullBeforePush":true,"disablePopups":false,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Sat May 08 2021 02:04:38 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 02:03:46 GMT+0200 (Central European Summer Time)"}
\ No newline at end of file
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
index 7aaa3aec4..d3a6c7a94 100644
--- a/conflict-files-obsidian-git.md
+++ b/conflict-files-obsidian-git.md
@@ -1,4 +1,3 @@
 # Conflict files
 Please resolve them and commit per command (This file will be deleted before the commit).
-- Not a file: .obsidian/plugins/obsidian-git/data.json
-- Not a file: .obsidian/workspace
\ No newline at end of file
+- Not a file: .obsidian/plugins/obsidian-git/data.json
\ No newline at end of file