diff --git a/.gitignore b/.gitignore
index 9af8fd610..b2fffb1bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 private/
 
 .obsidian/workspace
+.obsidian/plugins/obsidian-git/data.json
diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json
index c677d56d6..53214c95c 100644
--- a/.obsidian/plugins/obsidian-git/data.json
+++ b/.obsidian/plugins/obsidian-git/data.json
@@ -1,5 +1 @@
-<<<<<<< HEAD
-{"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 01:50:27 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:50:27 GMT+0200 (Central European Summer Time)"}
-=======
-{"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 01:49:38 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:48:46 GMT+0200 (Central European Summer Time)"}
->>>>>>> b1c5a29aa66dc3f6cd7a95c742a7ba8939874e5c
+{"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 01:51:27 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:51:27 GMT+0200 (Central European Summer Time)"}
\ No newline at end of file