fix conflict

Author: RogerKSI

.github/workflows/golangci-lint.yml

@@ -10,7 +10,7 @@ jobs:
           go-version: 1.22.3
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v5
+        uses: golangci/golangci-lint-action@v6
         with:
           version: v1.55.2
           args: --timeout=5m0s