diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 2aa36432..520246a1 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -129,6 +129,7 @@ chooseInterface(){
 	done
 }
 
+<<<<<<< HEAD
 use4andor6(){
 	# Let use select IPv4 and/or IPv6
 	cmd=(whiptail --separate-output --checklist "Select Protocols" $r $c 2)
@@ -165,6 +166,13 @@ use4andor6(){
 		echo "::: Exiting"
 		exit 1
 	fi
+=======
+useIPv6dialog()
+{
+piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
+whiptail --msgbox --backtitle "IPv6..." --title "IPv6 Supported" "$piholeIPv6 will be used to block ads." $r $c
+$SUDO touch /etc/pihole/.useIPv6
+>>>>>>> upstream/development
 }
 
 useIPv6dialog(){
@@ -371,6 +379,24 @@ checkForAndInstallDependencies(){
 	fi
 }
 
+<<<<<<< HEAD
+=======
+installPihole()
+{
+installDependencies
+stopServices
+$SUDO mkdir -p /etc/pihole/
+$SUDO chown www-data:www-data /var/www/html
+$SUDO chmod 775 /var/www/html
+$SUDO usermod -a -G www-data pi
+$SUDO lighty-enable-mod fastcgi fastcgi-php
+installScripts
+installConfigs
+installWebAdmin
+installPiholeWeb
+installCron
+runGravity
+>>>>>>> upstream/development
 
 installPihole(){
 	installDependencies
@@ -420,4 +446,4 @@ $SUDO mv $tmpLog $instalLogLoc
 displayFinalMessage
 
 $SUDO service dnsmasq start
-$SUDO service lighttpd start
\ No newline at end of file
+$SUDO service lighttpd start
diff --git a/gravity.sh b/gravity.sh
index fa94aabe..7a7fe231 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -10,8 +10,24 @@
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 
+# Run this script as root or under sudo
+if [[ $EUID -eq 0 ]];then
+	echo "You are root."
+else
+	echo "::: sudo will be used."
+  # Check if it is actually installed
+  # If it isn't, exit because the install cannot complete
+  if [[ $(dpkg-query -s sudo) ]];then
+		export SUDO="sudo"
+  else
+		echo "::: Please install sudo or run this script as root."
+    exit 1
+  fi
+fi
+
 piholeIPfile=/tmp/piholeIP
 piholeIPv6file=/etc/pihole/.useIPv6
+
 if [[ -f $piholeIPfile ]];then
     # If the file exists, it means it was exported from the installation script and we should use that value instead of detecting it in this script
     piholeIP=$(cat $piholeIPfile)
@@ -70,8 +86,8 @@ function gravity_collapse() {
         # Temporary hack to allow non-root access to pihole directory
         # Will update later, needed for existing installs, new installs should
         # create this directory as non-root
-        sudo chmod 777 $piholeDir
-        find "$piholeDir" -type f -exec sudo chmod 666 {} \;
+        $SUDO chmod 777 $piholeDir
+        find "$piholeDir" -type f -exec $SUDO chmod 666 {} \;
 	else
         echo "** Creating pihole directory..."
         mkdir $piholeDir
@@ -247,10 +263,10 @@ function gravity_reload() {
 
 	if [[ $dnsmasqPid ]]; then
 		# service already running - reload config
-		sudo kill -HUP $dnsmasqPid
+		$SUDO kill -HUP $dnsmasqPid
 	else
 		# service not running, start it up
-		sudo service dnsmasq start
+		$SUDO service dnsmasq start
 	fi
 }