fix(ci): unblock preflight and quickstart golden-path gates

Repair the duplicated case in preflight.sh, point golden-path at
scripts/quickstart-verify.sh, and drop a stray merge marker so required
CI gates can pass for the fixture cleanup PR.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: Goodnessukaigwe

scripts/preflight.sh

@@ -88,10 +88,6 @@ check_tools() {
 
     local got=""
     # Prefer tool-native version commands: kubectl rejects `--version`.
-    case "${binary}" in
-      kubectl) got=$(kubectl version --client 2>&1 | _extract_semver) || got="" ;;
-      helm)    got=$(helm version --short 2>&1 | _extract_semver) || got="" ;;
-      *)       got=$(${binary} --version 2>&1 | _extract_semver) || got="" ;;
     case "${binary}" in
       kubectl)
         # `kubectl --version` is not a valid client flag; use --client.

scripts/quickstart-golden-path.sh

@@ -15,7 +15,7 @@ step() { echo; echo "==> $1"; }
 fail() { echo "FAIL: $1" >&2; FAILURES=$((FAILURES + 1)); }
 
 step "Quickstart entry points exist"
-for f in scripts/archive/quickstart-verify.sh README.md Makefile; do
+for f in scripts/quickstart-verify.sh README.md Makefile; do
   if [[ -e "${REPO_ROOT}/${f}" ]]; then
     echo "ok: ${f}"
   else
@@ -24,7 +24,7 @@ for f in scripts/archive/quickstart-verify.sh README.md Makefile; do
 done
 
 step "Quickstart scripts parse (bash -n)"
-for f in scripts/archive/quickstart-verify.sh scripts/preflight.sh scripts/secret-rotation-check.sh; do
+for f in scripts/quickstart-verify.sh scripts/preflight.sh scripts/secret-rotation-check.sh; do
   if [[ -e "${REPO_ROOT}/${f}" ]]; then
     if bash -n "${REPO_ROOT}/${f}"; then
       echo "ok: ${f}"

scripts/quickstart-verify.sh

@@ -234,4 +234,3 @@ else
   echo "  Review the output above and fix failing steps."
   exit 1
 fi
->>>>>>> origin/main