diff --git a/src/ragnar/cli.py b/src/ragnar/cli.py
index b3711c6..fc52916 100644
--- a/src/ragnar/cli.py
+++ b/src/ragnar/cli.py
@@ -31,26 +31,6 @@ def bot_task(username, password):
 
 def main():
     args = parse_args()
-<<<<<<< HEAD
-    with Executor(500) as executor:
-        usernames = [
-            # "no-spam1",
-            # "no-spam2",
-            # "no-spam3",
-            # "no-spam4",
-            # "no-spam",
-            "no-spam2353",
-            "no-spam2351",
-            "no-spam2350",
-            "no-spam2349",
-            "JamesMedina",
-            "MichelleWeeks",
-            "JaredRuiz",
-            "LoriMcgee",
-            "AmandaFloyd",
-        ]
-        for username in usernames:
-=======
     usernames = [
         # "no-spam1",
         # "no-spam2",
@@ -69,8 +49,7 @@ def main():
     ]
 
     with Executor(len(usernammes) + 1) as executor:
-                for username in usernames:
->>>>>>> bd8abd5 (Better process pool..)
+        for username in usernames:
             executor.submit(bot_task, f"{username}@molodetz.nl", args.password)
         executor.shutdown(wait=True)