diff --git a/en/services.html b/en/services.html
index 5e15ee1..afc1e4e 100644
--- a/en/services.html
+++ b/en/services.html
@@ -67,11 +67,7 @@
 	<li><a href=//bloat.vern.cc>BloatFE (Mastodon Acc Needed)</a> - A web client for Mastodon Network</li>
 	<li><a href=ssh://vern.cc:2221>Devzat (Seperate Sign-Up)</a> - Chat over ssh!</li>
 	<li><a href=//jitsi.vern.cc>Jitsi (Reg needed)</a> - Free video conferencing software for web &amp; mobile</li>
-<<<<<<< HEAD
 	<li><a href="//wiki.vern.cc/doku.php?id=matrix">Matrix (Reg needed)</a> - A network for secure, decentralized communication</li>
-=======
-	<li><a href=//wiki.vern.cc/doku.php?id=matrix>Matrix (Reg needed)</a> - A network for secure, decentralized communication</li>
->>>>>>> e3b33d6c0238163b0c75ce12f845884a8ca3db8b
 	<li><a href="//wiki.vern.cc/doku.php?id=matrix#xmpp_bridge">Bifrost</a> - XMPP &lt;-&gt; Matrix Bridge</li>
 	<li><a href=//cn.vern.cc>Cinny</a> (AD: <a href=//cinny.vern.cc>A</a>) - Yet another Matrix client</li>
 	<li><a href=//riot.vern.cc>Element</a> - Secure collaboration and messaging</li>