Fixing conflicts

Author: ycombinator

.github/workflows/golangci-lint.yml

@@ -39,11 +39,7 @@ jobs:
         uses: golangci/golangci-lint-action@v2
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-<<<<<<< HEAD
-          version: v1.64.5
-=======
           version: v2.5.0
->>>>>>> 15b8c8a (Bump Go version to 1.25.1 (#5562))
 
           # Give the job more time to execute.
           # Regarding `--whole-files`, the linter is supposed to support linting of changed a patch only but,