diff --git a/.github/workflows/dendrite.yml b/.github/workflows/dendrite.yml
index f8019b3ea..2306bcd9a 100644
--- a/.github/workflows/dendrite.yml
+++ b/.github/workflows/dendrite.yml
@@ -102,7 +102,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+<<<<<<< HEAD
         go: ["1.18", "1.19"]
+=======
+        go: ["1.18"]
+>>>>>>> 698369f5 (merge latest changes from dendrite main (#15))
     steps:
       - uses: actions/checkout@v3
       - name: Setup go
@@ -132,7 +136,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+<<<<<<< HEAD
         go: ["1.18", "1.19"]
+=======
+        go: ["1.18"]
+>>>>>>> 698369f5 (merge latest changes from dendrite main (#15))
         goos: ["linux"]
         goarch: ["amd64", "386"]
     steps:
@@ -166,7 +174,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+<<<<<<< HEAD
         go: ["1.18", "1.19"]
+=======
+        go: ["1.18"]
+>>>>>>> 698369f5 (merge latest changes from dendrite main (#15))
         goos: ["windows"]
         goarch: ["amd64"]
     steps: