diff --git a/journal/2022-11-25.md b/journal/2022-11-25.md
index 45ddf8b8f..a67245e9c 100644
--- a/journal/2022-11-25.md
+++ b/journal/2022-11-25.md
@@ -1,6 +1,7 @@
 - [[2022-11-24]] was fine actually :)
 - now doing [[yoga at midnight]].
   - [[go/move/24]]
+<<<<<<< Updated upstream
 - [[work]]
   - actually alright :)
 - [[social coop]]
@@ -8,3 +9,9 @@
 - [[flancia]]
   - let's see where the night takes us!
 
+=======
+- [[dados fractales]]
+- love [[git stash]]
+  - #push [[agora doc]]
+    - [[agora protocol]] enables programmatic [[conflict resolution]] on the semantic level
+>>>>>>> Stashed changes