chore: version bump for test

Author: samrose

ansible/vars.yml

@@ -9,9 +9,21 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
+<<<<<<< HEAD
   postgresorioledb-17: "17.0.1.106-orioledb"
   postgres17: "17.4.1.056"
   postgres15: "15.8.1.113"
+=======
+  postgresorioledb-17: "17.0.1.088-orioledb"
+  postgres17: "17.4.1.038"
+  postgres15: "15.8.1.094"
+  postgres14: "14.18.1.001-test-1"
+
+# Note, postgres14 is not built on every release, but is available in the nix cache. 
+# postgres14 is included here to support upgrading from postgres14 to newer versions.
+# an image can be created with a special workflow that builds postgres14 image. 
+# Supabase will not create and release postgres14 images other than as a utility for internal use.
+>>>>>>> 316bfef5 (chore: version bump for test)
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"