diff --git a/main.py b/main.py
index 0f436a8..d9aa66b 100644
--- a/main.py
+++ b/main.py
@@ -54,11 +54,8 @@ shared["load_modules"] = [
     "webtoken",
     # Adds /lol, broadcasts random funyy messages. A bit like the splash text in the menu
     "saylol",
-<<<<<<< HEAD
-=======
     # Adds /signalstrength, lets you request a signal strength and an amount of items will be inserted into target container to meet that strength.
     "signalstrength",
->>>>>>> b4f5a68e4e3ba4993e8326d2f11f9582933b694e
     # Shows the owner of a skull when right-clicked
     "skullclick",
     # Adds /listen, highlights chat and plays a sound when your name was mentioned