diff --git a/.github/workflows/test_and_build.yaml b/.github/workflows/test_and_build.yaml
index b7667c6..187f0c2 100644
--- a/.github/workflows/test_and_build.yaml
+++ b/.github/workflows/test_and_build.yaml
@@ -62,11 +62,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v5
         with:
           version: latest
-<<<<<<< Updated upstream
-          args: release --skip=publish --clean
-=======
           args: release --snapshot --skip=publish --clean
->>>>>>> Stashed changes
   notification:
     runs-on: ubuntu-latest
     needs: test