diff --git a/README.md b/README.md
index a3aead1..fd7c994 100644
--- a/README.md
+++ b/README.md
@@ -1,28 +1,25 @@
 ## openvpn-install
-<<<<<<< HEAD
-=======
+
 # CONNECTING
 ./connect.sh
 Follow the promots to connect, use the .ovpn files generated by the install.
->>>>>>> master
+
 #
 OpenVPN [road warrior](http://en.wikipedia.org/wiki/Road_warrior_%28computing%29) installer for Debian, Ubuntu and CentOS.
 #
 This script will let you setup your own VPN server in no more than a minute, even if you haven't used OpenVPN before. It has been designed to be as unobtrusive and universal as possible.
-#
-<<<<<<< HEAD
+
 ### Server Installation
-=======
+
 ### Installation
->>>>>>> master
+
 Run the script and follow the assistant:
 #
 `wget https://git.io/vpn -O openvpn-install.sh && bash openvpn-install.sh`
 #
 Once it ends, you can run it again to add more users, remove some of them or even completely uninstall OpenVPN.
-<<<<<<< HEAD
+
 # Client Connecting
 ./connect.sh
 Follow the promots to connect, use the .ovpn files generated by the install.
-=======
->>>>>>> master
+