diff --git a/.obsidian-git-data b/.obsidian-git-data
index 67616c71d..5f7237ea5 100644
--- a/.obsidian-git-data
+++ b/.obsidian-git-data
@@ -1,9 +1,14 @@
+<<<<<<< HEAD
 Thu Jul 08 2021 18:51:41 GMT+0200 (Central European Summer Time)
 Thu Jul 08 2021 18:51:44 GMT+0200 (Central European Summer Time)
 Thu Jul 08 2021 02:04:10 GMT+0200 (Central European Summer Time)
 =======
 Thu Jul 08 2021 02:03:54 GMT+0200 (Central European Summer Time)
 Thu Jul 08 2021 02:02:54 GMT+0200 (Central European Summer Time)
+=======
+Thu Jul 08 2021 18:51:55 GMT+0200 (Central European Summer Time)
+Thu Jul 08 2021 18:50:55 GMT+0200 (Central European Summer Time)
+>>>>>>> 1f3c4fedc273f7cb0cb25384122a8b17ed7389ba
 Wed Jul 07 2021 12:58:41 GMT+0200 (Central European Summer Time)
 =======
 Wed Jul 07 2021 00:33:04 GMT+0200 (Central European Summer Time)
diff --git a/bmock.md b/bmock.md
index 6bac58e75..be1e001fd 100644
--- a/bmock.md
+++ b/bmock.md
@@ -1,2 +1 @@
-# Bmock
-
+- [[pull]] [[b]]
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
index 3d5d61cb1..bf8d31134 100644
--- a/conflict-files-obsidian-git.md
+++ b/conflict-files-obsidian-git.md
@@ -1,3 +1,3 @@
-# Conflict files
+in  Conflict files
 Please resolve them and commit per command (This file will be deleted before the commit).
 - Not a file: .obsidian-git-data
\ No newline at end of file