diff --git a/foam.md b/foam.md
index fb8ec21b9..d43901967 100644
--- a/foam.md
+++ b/foam.md
@@ -3,7 +3,7 @@
 - A [[project]].
 	- [[roam like]]. A [[vscode]] extension.
 	- [[go]] https://foambubble.github.io/foam/
-	  - By [[jevakallio]].
+	  - By [[jevakallio]], [[riccardo ferretti]].
 	  - Notable contributors / people I've met in the [[discord]]: [[ingalless]] [[scottjoe]] [[riccardo]] [[mathieudutour]].
 	- As of [[2021-01-04]], my personal [[agora client]].
 	  - See [[foam settings]], which describes my setup.
diff --git a/journal/2021-11-25.md b/journal/2021-11-25.md
index ef01ff5e2..fa016d8d4 100644
--- a/journal/2021-11-25.md
+++ b/journal/2021-11-25.md
@@ -1,10 +1,7 @@
 # 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]]
->>>>>>> 453270d64560fbcb76b33fa3a7b367028ed1401e
diff --git a/journal/2021-11-26.md b/journal/2021-11-26.md
index 3d363d0d8..6409a1288 100644
--- a/journal/2021-11-26.md
+++ b/journal/2021-11-26.md
@@ -10,4 +10,8 @@
   - [[steven fan]]
 - [[arte problemático]]
 - [[yoga for chefs]]
-- [[visakan]]
\ No newline at end of file
+- [[visakan]]
+- [[walter benjamin]]
+  - [[illuminations]]
+  - [[the arcades project]]
+- [[foam]]
\ No newline at end of file
diff --git a/riccardo ferretti.md b/riccardo ferretti.md
index f5e4f1411..198f6f062 100644
--- a/riccardo ferretti.md	
+++ b/riccardo ferretti.md	
@@ -1,5 +1,6 @@
 # Riccardo Ferretti
 
+- a [[person]]
 - [[github]] https://github.com/riccardoferretti
 - [[foam]] [[project lead]]