diff --git a/journal/2021-11-25.md b/journal/2021-11-25.md
index 5995529a2..ef01ff5e2 100644
--- a/journal/2021-11-25.md
+++ b/journal/2021-11-25.md
@@ -1,4 +1,10 @@
 # 2021-11-25
 
+<<<<<<< HEAD
+- [[push]] [[ricardo piglia]] se basa en [[benjamin]] en [[las tres vanguardias]]
+  - [[experiencia y pobreza]]
+  - [[el narrador]]
+=======
 - [[workitect]] told me about [[world happiness foundation]]
-  - [[luis gallardo]]
\ No newline at end of file
+  - [[luis gallardo]]
+>>>>>>> 453270d64560fbcb76b33fa3a7b367028ed1401e