diff --git a/lib.sh b/lib.sh
index c1ccf6c9..f1ba7e02 100644
--- a/lib.sh
+++ b/lib.sh
@@ -44,18 +44,13 @@ UNIXUSER_PROFILE="/home/$UNIXUSER/.bash_profile"
 ROOT_PROFILE="/root/.bash_profile"
 # MARIADB
 SHUF=$(shuf -i 25-29 -n 1)
-<<<<<<< HEAD
 MARIADB_PASS=$(tr -dc "a-zA-Z0-9@#*=" < /dev/urandom | fold -w "$SHUF" | head -n 1)
 NEWMARIADBPASS=$(tr -dc "a-zA-Z0-9@#*=" < /dev/urandom | fold -w "$SHUF" | head -n 1)
 [ ! -z "$NCDB" ] && NCCONFIGDB=$(grep "dbname" $NCPATH/config/config.php | awk '{print $3}' | sed "s/[',]//g")
 MYCNF=/root/.my.cnf
 [ ! -z "$MYCNFPW" ] && MARIADBMYCNFPASS=$(grep "password" $MYCNF | sed -n "/password/s/^password='\(.*\)'$/\1/p")
-=======
-PGDB_PASS=$(tr -dc "a-zA-Z0-9@#*=" < /dev/urandom | fold -w "$SHUF" | head -n 1)
-NEWPGPASS=$(tr -dc "a-zA-Z0-9@#*=" < /dev/urandom | fold -w "$SHUF" | head -n 1)
 [ ! -z "$NCDB" ] && NCCONFIGDB=$(grep "dbname" $NCPATH/config/config.php | awk '{print $3}' | sed "s/[',]//g")
 [ ! -z "$NCDBPASS" ] && NCCONFIGDBPASS=$(grep "dbpassword" $NCPATH/config/config.php | awk '{print $3}' | sed "s/[',]//g")
->>>>>>> 59adc5c... install_if_not (#296)
 # Path to specific files
 PHPMYADMIN_CONF="/etc/apache2/conf-available/phpmyadmin.conf"
 SECURE="$SCRIPTS/setup_secure_permissions_nextcloud.sh"
diff --git a/nextcloud_update.sh b/nextcloud_update.sh
index 4f2fabee..607ce44b 100644
--- a/nextcloud_update.sh
+++ b/nextcloud_update.sh
@@ -102,7 +102,6 @@ else
     exit 0
 fi
 
-<<<<<<< HEAD
 # Make sure old instaces can upgrade as well
 if [ ! -f "$MYCNF" ] && [ -f /var/mysql_password.txt ]
 then
@@ -133,7 +132,8 @@ then
     exit 1
 else
     rm -f /var/mysql_password.txt
-=======
+fi
+
 # Upgrade Nextcloud
 echo "Checking latest released version on the Nextcloud download server and if it's possible to download..."
 if ! wget -q --show-progress -T 10 -t 2 "$NCREPO/$STABLEVERSION.tar.bz2"
@@ -145,7 +145,6 @@ then
     exit 1
 else
     rm -f "$STABLEVERSION.tar.bz2"
->>>>>>> 59adc5c... install_if_not (#296)
 fi
 
 echo "Backing up files and upgrading to Nextcloud $NCVERSION in 10 seconds..."