diff --git a/.obsidian-git-data b/.obsidian-git-data
index 1f153172c..28cc8cdf2 100644
--- a/.obsidian-git-data
+++ b/.obsidian-git-data
@@ -1,2 +1,12 @@
+<<<<<<< HEAD
 Sat Jul 10 2021 00:27:17 GMT+0200 (Central European Summer Time)
-Sat Jul 10 2021 00:27:17 GMT+0200 (Central European Summer Time)
\ No newline at end of file
+Sat Jul 10 2021 00:27:17 GMT+0200 (Central European Summer Time)
+=======
+Sat Jul 10 2021 00:27:33 GMT+0200 (Central European Summer Time)
+Sat Jul 10 2021 00:26:33 GMT+0200 (Central European Summer Time)
+Sat Jul 10 2021 00:26:33 GMT+0200 (Central European Summer Time)
+=======
+Sat Jul 10 2021 00:26:17 GMT+0200 (Central European Summer Time)
+Sat Jul 10 2021 00:25:17 GMT+0200 (Central European Summer Time)
+>>>>>>> b1893220e24f5e449a4d008f1a6d11e5f6049244
+>>>>>>> bb2b266a4ad1955da598f2d64adc55d047d768f3
diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json
index 23a40c44b..72b192885 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":true,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Mon Jun 21 2021 14:19:17 GMT+0200 (Central European Summer Time)","lastAutoPull":"Mon Jun 21 2021 14:19:17 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 Jul 03 2021 11:50:30 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat Jul 03 2021 11:50:30 GMT+0200 (Central European Summer Time)"}
\ No newline at end of file