diff --git a/Main-Installer.sh b/Main-Installer.sh
index 2c71901..60a9c70 100644
--- a/Main-Installer.sh
+++ b/Main-Installer.sh
@@ -28,16 +28,11 @@ do
         "Apache")
             script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/Apache-Installer.sh
             break;;
-<<<<<<< HEAD
-        "Apache, Nginx reverse proxy")
-            script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/RevProxySimple.sh
-=======
         "Nginx proxy")
-            script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/dev/RevProxySimple.sh
->>>>>>> dev
+            script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/RevProxySimple.sh
             break;;
         "Nginx proxy & standalone")
-            script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/dev/RevProxyAdvanced.sh
+            script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/RevProxyAdvanced.sh
             break;;
         "Nginx, PHP-FPM")
             script=https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Web/raw/branch/master/NGINX-Installer.sh
@@ -198,8 +193,6 @@ if [ $cockpit = 1 ]; then
     source Slave-Installer.sh
 fi
 
-
-
 ##-------------------##
 #    Backup Script    #
 ##-------------------##
@@ -208,8 +201,6 @@ wget https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Backup/raw/branch/master/WP_
 
 
 
-
-
 echo "Installatie geslaagd!"
 
 ##------------##