diff --git a/journals/2023_07_10.md b/journals/2023_07_10.md
index 3cf20d57..9daeff90 100644
--- a/journals/2023_07_10.md
+++ b/journals/2023_07_10.md
@@ -1 +1,5 @@
--
\ No newline at end of file
+<<<<<<< HEAD
+-
+=======
+- [[English Lesson]]
+>>>>>>> be30e0a (Auto saved by Logseq)