diff --git a/compose/strfry/mn.federation_urls.txt b/compose/strfry/mn.federation_urls.txt
index 63a94f1..64b1eaf 100644
--- a/compose/strfry/mn.federation_urls.txt
+++ b/compose/strfry/mn.federation_urls.txt
@@ -1,8 +1,4 @@
 ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr
 ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr
 ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr
-<<<<<<< Updated upstream
 ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/nostr
-=======
-ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/nostr
->>>>>>> Stashed changes