chore: cleanup + bump version for test

Author: samrose

ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh

@@ -482,7 +482,8 @@ EOF
         # Additional check to ensure postgres is really stopped
         if [ -f "${PGDATAOLD}/postmaster.pid" ]; then
             echo "PostgreSQL still running, forcing stop..."
-            kill -9 $(head -n 1 "${PGDATAOLD}/postmaster.pid") || true
+            pid=$(head -n 1 "${PGDATAOLD}/postmaster.pid")
+            kill -9 "$pid" || true
             rm -f "${PGDATAOLD}/postmaster.pid"
         fi
     else

ansible/vars.yml

@@ -9,15 +9,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-<<<<<<< HEAD
   postgresorioledb-17: "17.0.1.079-orioledb-pgup-1"
   postgres17: "17.4.1.029-pgup-1"
   postgres15: "15.8.1.086-pgup-1"
-=======
-  postgresorioledb-17: "17.0.1.079-orioledb-upgrade-13"
-  postgres17: "17.4.1.029-upgrade-13"
-  postgres15: "15.8.1.086-upgrade-13"
->>>>>>> c27f9870 (chore: bump version)
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"