diff --git a/journal/2022-01-14.md b/journal/2022-01-14.md
index bc7c811ae..6e8b28875 100644
--- a/journal/2022-01-14.md
+++ b/journal/2022-01-14.md
@@ -1,5 +1,14 @@
 # 2022-01-14
 
+<<<<<<< HEAD
+
+- [[8]]
+  - [[the eightfold path]]
+- [[13]]
+  - [[17]]
+    - [[18 43]]
+    - [[cicadas]]
+=======
 - Took the day off work :)
   - Went to [[greifensee]]: [[nänikon]] to [[uster]].
 - [[vera]] and [[neil]] amazing
@@ -10,3 +19,4 @@
   - there is [[your flancia]].
   - there is my [[flancia]].
   - there are many [[flancias]]!
+>>>>>>> ba4558a1ac33fbaa8d1a1cc4bbf88fa1a97e767e