diff --git a/.github/workflows/dendrite.yml b/.github/workflows/dendrite.yml
index 0112aaf10..cd397d742 100644
--- a/.github/workflows/dendrite.yml
+++ b/.github/workflows/dendrite.yml
@@ -273,11 +273,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-<<<<<<< HEAD
           go-version: "1.19"
-=======
-          go-version: "1.18"
->>>>>>> eb29a315507f0075c2c6a495ac59c64a7f45f9fc
           cache: true
       - name: Build upgrade-tests
         run: go build ./cmd/dendrite-upgrade-tests
@@ -297,11 +293,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-<<<<<<< HEAD
           go-version: "1.19"
-=======
-          go-version: "1.18"
->>>>>>> eb29a315507f0075c2c6a495ac59c64a7f45f9fc
           cache: true
       - name: Build upgrade-tests
         run: go build ./cmd/dendrite-upgrade-tests
@@ -481,7 +473,7 @@ jobs:
         upgrade_test_direct,
         sytest,
         complement,
-        integration
+        integration,
       ]
     runs-on: ubuntu-latest
     if: ${{ !cancelled() }} # Run this even if prior jobs were skipped