diff --git a/fauno.md b/fauno.md
index 8b09f2dc1..7110f2b97 100644
--- a/fauno.md
+++ b/fauno.md
@@ -1,5 +1,7 @@
+
 - a [[person]]
 	- [[pirate]]
 		- likes [[monkey island]]
+	- in [[sutty]]
 	- [[go]] https://fauno.endefensadelsl.org/
 		- [[en]] https://fauno.endefensadelsl.org/en/
\ No newline at end of file
diff --git a/journal/2021-10-22.md b/journal/2021-10-22.md
index 2cd0c24f8..f052f6a5a 100644
--- a/journal/2021-10-22.md
+++ b/journal/2021-10-22.md
@@ -8,15 +8,13 @@
 - [[flow]]
 - [[249]]
 - [[the mind illuminated]]
-<<<<<<< HEAD
+- [[fauno]]
 - [[matrix]]
   - [[xmpp]]
     - [[straw]] told me about [[dino]]
-=======
 - [[knowledge graphs]]
 - [[an invitation to applied category theory]]
 - [[lemmy]]
->>>>>>> 0eb17a2163f4e4404b99620828862be73f3fbc6a
 - [[i am cuba]] 
   - [[es]] [[soy cuba]]
 - [[do]]
diff --git a/sutty.md b/sutty.md
index 50286e329..e27b8ba1b 100644
--- a/sutty.md
+++ b/sutty.md
@@ -1,6 +1,7 @@
 - a [[coop]]
 	- [[web sites]] [[activism]] [[publisher]]
 	- [[argentina]]
+	- in [[hypha]]
 	- [[go]] https://sutty.nl
 	- [[twitter]] https://twitter.com/suttyweb
 	- [[miembros]]