diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 6f0540bb..1b5aa333 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -18,11 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< Updated upstream
-        go: [ '1.19' ]
-=======
         go: [ '1.21' ]
->>>>>>> Stashed changes
     steps:
     - name: Checkout source
       uses: actions/checkout@v3
diff --git a/.github/workflows/publish-images.yaml b/.github/workflows/publish-images.yaml
index 6a3eb98a..dc9d35b6 100644
--- a/.github/workflows/publish-images.yaml
+++ b/.github/workflows/publish-images.yaml
@@ -19,11 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< Updated upstream
-        go: [ '1.19' ]
-=======
         go: [ '1.21' ]
->>>>>>> Stashed changes
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
     - name: Checkout source
@@ -53,11 +49,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< Updated upstream
-        go: [ '1.19' ]
-=======
         go: [ '1.21' ]
->>>>>>> Stashed changes
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
     - name: Checkout source
@@ -87,11 +79,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< Updated upstream
-        go: [ '1.19' ]
-=======
         go: [ '1.21' ]
->>>>>>> Stashed changes
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
     - name: Checkout source
diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml
index 48daff6d..c44fcd74 100644
--- a/.github/workflows/test-and-build.yaml
+++ b/.github/workflows/test-and-build.yaml
@@ -16,11 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< Updated upstream
-        go: [ '1.19' ]
-=======
         go: [ '1.21' ]
->>>>>>> Stashed changes
     steps:
     - name: Checkout source
       uses: actions/checkout@v3
@@ -39,11 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< Updated upstream
-        go: [ '1.19' ]
-=======
         go: [ '1.21' ]
->>>>>>> Stashed changes
     steps:
     - name: Checkout source
       uses: actions/checkout@v3
@@ -62,11 +54,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< Updated upstream
-        go: [ '1.19' ]
-=======
         go: [ '1.21' ]
->>>>>>> Stashed changes
     steps:
     - name: Checkout source
       uses: actions/checkout@v3
@@ -85,11 +73,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< Updated upstream
-        go: [ '1.19' ]
-=======
         go: [ '1.21' ]
->>>>>>> Stashed changes
     steps:
     - name: Checkout source
       uses: actions/checkout@v3
@@ -108,11 +92,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< Updated upstream
-        go: [ '1.19' ]
-=======
         go: [ '1.21' ]
->>>>>>> Stashed changes
     steps:
     - name: Checkout source
       uses: actions/checkout@v3
@@ -131,11 +111,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< Updated upstream
-        go: [ '1.19' ]
-=======
         go: [ '1.21' ]
->>>>>>> Stashed changes
     steps:
     - name: Checkout source
       uses: actions/checkout@v3