diff --git a/Makefile b/Makefile
index b92fa63..bafadc3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,5 @@
-<<<<<<< HEAD
 fmt: cp
 	find . -name '*.go' -exec gofumpt -w -s -extra {} \;
 
 cp:
 	cp -v ./.github/workflows/page.yml pkg/templates/page.yml
-||||||| 883cc95
-fmt:
-	find . -name '*.go' -exec gofumpt -w -s -extra {} \;
-=======
-fmt:
-	find . -name '*.go' -exec gofumpt -w -s -extra {} \;
->>>>>>> a0804fdff6ce1cf2312908d85889ae632c2915e6
diff --git a/pkg/templates/page.yml b/pkg/templates/page.yml
index 5ec4445..c4fb3ab 100644
--- a/pkg/templates/page.yml
+++ b/pkg/templates/page.yml
@@ -31,7 +31,8 @@ jobs:
       - name: Build Site Generator
         run: |
           go install github.com/go-i2p/go-gh-page/cmd/github-site-gen@latest
-          cp -v "$GOPATH/bin/github-site-gen" ./github-site-gen
+          export GOBIN=$(go env GOPATH)/bin
+          cp -v "$GOBIN/github-site-gen" ./github-site-gen
           # Ensure the binary is executable
           chmod +x github-site-gen
 
@@ -56,4 +57,4 @@ jobs:
           folder: site      # The folder the action should deploy
           branch: gh-pages  # The branch the action should deploy to
           clean: true       # Automatically remove deleted files from the deploy branch
-          commit-message: "Deploy site generated on ${{ github.sha }}"
\ No newline at end of file
+          commit-message: "Deploy site generated on ${{ github.sha }}"