diff --git a/framatalk.md b/framatalk.md
new file mode 100644
index 000000000..cb5da751c
--- /dev/null
+++ b/framatalk.md
@@ -0,0 +1,4 @@
+- a [[tool]].
+  - [[videoconferencing]]. [[jitsi]] based.
+  - #go https://framatalk.org/framatalk 
+    - drops you straight into call [[framatalk]], beautiful.
diff --git a/journal/2023-10-22.md b/journal/2023-10-22.md
index a91f4e211..4f86a7032 100644
--- a/journal/2023-10-22.md
+++ b/journal/2023-10-22.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 - [[trip to x]]!
   - Flying to [[Hong Kong]] and then [[Tokyo]] today.
   - With [[AG]] :)
@@ -19,3 +20,8 @@ I think I will try to do one or two quick iterations on the [[Agora Server]] UI,
 Moving on to larger things, [[mycoverse]]/[[fediverse]] integration is something I would love to get done in this Q4 2023 so getting started on it would make a lot of sense. I would love to understand what is the minimum that Agora Server would need to do to be able to expose user accounts as Fediverse feeds. Then new/updated nodes could generate something close to new posts/notes? Unsure.
 
 Also, some playing with an hypothetical [[knowledge commons extension]] for e.g. [[Obsidian]] or [[Logseq]] or [[VSCode]] could be in order after the conversation last week with the [[fellowship of the link]]. But one blocker there is that I'm currently *not* using either Obsidian or VSCode as garden editors, so I'm not directly scratching an itch. Having said that, moving back to Obsidian or Logseq or [[Foam]] for a bit could make sense to see how far they've gone since the last time I've used them. It's still a shame Obsidian is not free software though.
+=======
+- I tried [[framatalk]] by [[framasoft]] yesterday and today and I'm liking it a lot.
+  - [[jitsi]] based.
+  - https://framatalk.org/your-room-name and it drops you straight into a call, beautiful.
+>>>>>>> 2c5b52a413a40d92a8033377f285a8589e4e12e5