diff --git a/README.md b/README.md
index 25a83f0..8b0b4cd 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,6 @@
 ## How to use
 * Build the project / Download the dll in the releases
 * Use any dll injecter to inject the dll
-
-<<<<<<< HEAD
-=======
-
->>>>>>> e4c3d4d9399fb035d1710cef129b9a94c8ac9ae4
 * Press F5 to toggle the hitbox (default is on)
 * Press F6 to pause
 * Press F7 to step one frame