diff --git a/download.py b/download.py
index 6c63af0..06de859 100644
--- a/download.py
+++ b/download.py
@@ -56,10 +56,5 @@ for download in downloads:
 
 keyboard.on_press_key("d", startDownload, suppress=False)
 keyboard.on_press_key("s", pauseDownload, suppress=False)
-<<<<<<< HEAD
 keyboard.on_press_key("q", pauseDownload, terminate)
 keyboard.wait("q")
-=======
-
-keyboard.wait("q")
->>>>>>> origin/main