diff --git a/project/modules/ROOT/pages/join.adoc b/project/modules/ROOT/pages/join.adoc
index ddbcdcb..4c79835 100644
--- a/project/modules/ROOT/pages/join.adoc
+++ b/project/modules/ROOT/pages/join.adoc
@@ -30,15 +30,9 @@ The large scale of the community can sometimes make it a little daunting for new
 There is far too much happening in Fedora all the time---even we find it hard to keep up with it all!
 So, if you are not sure of where to begin or have any queries at all, come hang out with the xref:fedora-join::index.adoc[Fedora Join Special Interest Group (SIG)] on any of our channels:
 
-<<<<<<< HEAD
 - Chat (over Matrix/Element): https://chat.fedoraproject.org/#/room/#join:fedoraproject.org[Join Fedora on Matrix/Element],
 
 - Email: https://lists.fedoraproject.org/archives/list/fedora-join@lists.fedoraproject.org/[Fedora Join mailing list],
-=======
-- Email: https://lists.fedoraproject.org/archives/list/fedora-join@lists.fedoraproject.org/[Fedora Join mailing list],
-- Chat (over Matrix/Element): https://chat.fedoraproject.org/#/room/#join:fedoraproject.org[Join Fedora on Matrix/Element],
->>>>>>> 93e4b9c620123b82fa52e0ff2398b93f7a396366
-
 
 Here, you can speak to community members and other newcomers while we explore Fedora together.
 We will help you learn the systems and processes that the Fedora community uses, and as you gain a better idea of where you would like to contribute, we will also help you learn the skills that you may need.