diff --git a/createmysql.sh b/createmysql.sh
index 1f19cbf..edcb46e 100755
--- a/createmysql.sh
+++ b/createmysql.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+<<<<<<< HEAD
 echo "Now we will need  update your system and install dependencies, do you want to proceed? " 
 PS3='Choose a option '
 options=("proceed"  "Quit")
@@ -8,6 +9,10 @@ do
     case $opt in
         "proceed")
  
+=======
+# echo "$(openssl rand -base64 12)"
+
+>>>>>>> e6b92619aca86245c4e77e357cbd326edf2cda46
 
 ########################## temporario ####################
 #sudo apt update 
@@ -120,5 +125,14 @@ MYSQL_SCRIPT
     esac
 done
 
+<<<<<<< HEAD
 # create shortcut on desktop
+=======
+# is the mysql already configured?
+
+
+#PASS=`pwgen -s 40 1`
+#PASS= dbpass
+
+>>>>>>> e6b92619aca86245c4e77e357cbd326edf2cda46