diff --git a/buildwrapper.sh b/buildwrapper.sh
index b0e0c9d..f23fe24 100755
--- a/buildwrapper.sh
+++ b/buildwrapper.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+<<<<<<< Updated upstream
 read -p "Enter Server CN (localhost or address): " SRVNAME
 read -p "Enter Client CN (localhost or address): " CLTNAME
 
@@ -132,3 +133,8 @@ chmod +x staging/server/server
 
 echo "[+] removing test logs"
 rm JobServ-Server-*
+=======
+./certs-gen.sh
+./gradlew clean build
+./package.sh
+>>>>>>> Stashed changes