diff --git a/README.md b/README.md
index 7be3247..ab2634f 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
-<<<<<<< HEAD
 ### Installing:
 =======
 # mcrcon
->>>>>>> develop
 
 mcrcon is console based Minecraft [rcon](https://developer.valvesoftware.com/wiki/Source_RCON_Protocol) client for remote administration and server maintenance scripts.