fix merge conflicts

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

Author: coleenquadros

.github/workflows/merge-acm-alertmanager.yaml

@@ -20,7 +20,6 @@ jobs:
       upstream: prometheus/alertmanager
       downstream: stolostron/prometheus-alertmanager
       sandbox: rhobs/acm-prometheus-alertmanager
-      go-version: "1.25"
       restore-upstream: >-
         CHANGELOG.md
         VERSION

.github/workflows/merge-acm-flow.yaml

@@ -166,7 +166,7 @@ jobs:
       - name: Resolve conflict due to deleted downstream files
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: |
-            git status --porcelain | awk '{ if ($1=="DU") print $2 }' | xargs -I {} git rm {}
+          git status --porcelain | awk '{ if ($1=="UD" || $1=="DU" || $1=="UU" || $1=="U") print $2 }' | xargs -I {} git rm {}
       - name: Continue after merge conflict
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: git merge --continue
@@ -191,7 +191,7 @@ jobs:
           git diff --cached --exit-code || git commit -s -m "[bot] add VERSION file with ${version_from_tag}"
       - uses: actions/setup-go@v5
         with:
-          go-version: ${{ inputs.go-version }}
+          go-version-file: go.mod
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ inputs.node-version }}

.github/workflows/merge-acm-grafana.yaml

@@ -19,7 +19,6 @@ jobs:
       upstream: grafana/grafana
       downstream: stolostron/grafana
       sandbox: rhobs/acm-grafana
-      go-version: "1.25"
       node-version: "22"
       go-mod-tidy: false
       restore-downstream: >-

.github/workflows/merge-acm-kube-state-metrics.yaml

@@ -20,7 +20,6 @@ jobs:
       upstream: kubernetes/kube-state-metrics
       downstream: stolostron/kube-state-metrics
       sandbox: rhobs/acm-kube-state-metrics
-      go-version: "1.25"
       restore-upstream: >-
         CHANGELOG.md
       restore-downstream: >-

.github/workflows/merge-acm-memcached-exporter.yaml

@@ -19,7 +19,6 @@ jobs:
       upstream: prometheus/memcached_exporter
       downstream: stolostron/memcached_exporter
       sandbox: rhobs/acm-memcached_exporter
-      go-version: "1.25"
       restore-downstream: >-
          OWNERS
       restore-upstream: >-

.github/workflows/merge-acm-node-exporter.yaml

@@ -19,7 +19,6 @@ jobs:
       upstream: prometheus/node_exporter
       downstream: stolostron/node-exporter
       sandbox: rhobs/acm-node-exporter
-      go-version: "1.25"
       restore-downstream: >-
          OWNERS
       restore-upstream: >-

.github/workflows/merge-acm-prometheus-operator.yaml

@@ -19,7 +19,6 @@ jobs:
       upstream: prometheus-operator/prometheus-operator
       downstream: stolostron/prometheus-operator
       sandbox: rhobs/acm-prometheus-operator
-      go-version: "1.25"
       restore-upstream: >-
         CHANGELOG.md
         Documentation

.github/workflows/merge-acm-prometheus.yaml

@@ -19,7 +19,6 @@ jobs:
       upstream: prometheus/prometheus
       downstream: stolostron/prometheus
       sandbox: rhobs/acm-prometheus
-      go-version: "1.25"
       restore-downstream: >-
         plugins.yml
         plugins

.github/workflows/merge-acm-thanos.yaml

@@ -19,7 +19,6 @@ jobs:
       upstream: thanos-io/thanos
       downstream: stolostron/thanos
       sandbox: rhobs/acm-thanos
-      go-version: "1.25"
       restore-downstream: >-
         OWNERS
       restore-upstream: >-