index.html

@@ -57,6 +57,9 @@ Communcations:
 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>
 
 
@@ -73,6 +76,7 @@ Services:
 <footer>
   <a href="mailto:hello@liberta.casa"> Contact </a> 
 </footer>
+>>>>>>> master
 </pre>
 </body>
 </html>