1 files changed, 20 insertions, 1 deletions
diff --git a/index.html b/index.html
index 50a460c..9e559e8 100644
--- a/index.html
+++ b/index.html
@@ -52,12 +52,31 @@ Services:
 Communcations:
 --------------
 
-<a href="/xmpp.html">XMPP</a> | <a href="/matrix.html">Matrix</a> | <a href="/irc.html">IRC</a> 
+<a href="/xmpp.html">XMPP</a> | <a href="/matrix.html">Matrix</a> | <a href="/irc.html">IRC</a> | <a href="https://meet.lysergic.dev"> Jitsi Video Conferencing </a>
 
 Services:
 ---------
 
+<<<<<<< HEAD
 <a href="https://pasta.lysergic.dev">Private Bin</a> | <a href="https://git.com.de">Gitea</a> | <a href="https://searx.xkek.net"> Searx search </a> | <a href="https://yacy.xkek.net"> Yacy Search</a>
+=======
+<a href="https://pasta.lysergic.dev">Private Bin</a> | <a href="https://git.com.de">Gitea</a> | <a href="https://searx.xkek.net"> Searx search </a> | <a href="https://yacy.xkek.net"> Yacy Search </a> | <a href="https://party.lysergic.dev"> Cytube - Watch together</a>
+
+
+
+
+
+
+
+
+
+
+
+
+<footer>
+  <a href="mailto:hello@liberta.casa"> Contact </a> 
+</footer>
+>>>>>>> master
 </pre>
 </body>
 </html>