diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 18f6c605..ee1cf39b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
       - name: Import GPG key
         id: import_gpg
         uses: crazy-max/ghaction-import-gpg@v5
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 0fcda867..e31e94ed 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
       - name: Import GPG key
         id: import_gpg
         uses: crazy-max/ghaction-import-gpg@v5
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d47831ca..888ad25c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
       - run: make test
 
   #lint:
@@ -33,7 +33,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
       - uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
@@ -50,7 +50,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
       - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown
index b4d102de..0b786142 100644
--- a/website/docs/index.html.markdown
+++ b/website/docs/index.html.markdown
@@ -107,4 +107,3 @@ In addition to [generic `provider` arguments](https://www.terraform.io/docs/conf
 * `sasl_aws_profile` - (Optional) AWS profile name to use.
 
 * `sasl_aws_creds_debug` - (Optional) Set this to true to turn AWS credentials debug.
->>>>>>> origin/master