diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 628cfb9..9c39239 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -34,11 +34,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
       - name: lint
-<<<<<<< HEAD
         uses: golangci/golangci-lint-action@v3
-=======
-        uses: golangci/golangci-lint-action@v3.1.0
->>>>>>> 0923093071cb (update workflows)
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.