diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a1f62cd..3c38bb4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,13 +1,7 @@
-<<<<<<< HEAD
 name: Release Go project
-=======
-name: goreleaser
->>>>>>> ae9c6b81c0ffc59f3acc6f5c46e1fcc34ad63b45
 
 on:
-  pull_request:
   push:
-<<<<<<< HEAD
     tags:
       - "*" # triggers only if push new tag version, like `0.8.4` or else
 
@@ -35,30 +29,3 @@ jobs:
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }}
-=======
-
-jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      -
-        name: Set up Go
-        uses: actions/setup-go@v2
-      -
-        name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
-        with:
-          # either 'goreleaser' (default) or 'goreleaser-pro'
-          distribution: goreleaser
-          version: latest
-          args: release --rm-dist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution
-          # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
->>>>>>> ae9c6b81c0ffc59f3acc6f5c46e1fcc34ad63b45