diff --git a/settings.json b/settings.json
index b006a21..8e375d8 100644
--- a/settings.json
+++ b/settings.json
@@ -1,5 +1 @@
-<<<<<<< HEAD
-{"Downscroll":true, "Keybinds":["a", "s", "kp5", "kp6"]}
-=======
-{"Keybinds":["a", "s", "up", "right"], "Downscroll":true}
->>>>>>> 8a7ee0f (Changed everything etc)
+{"Keybinds":["a", "s", "up", "right"], "Downscroll":true}
\ No newline at end of file