diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 93784bb..1aa4a55 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -168,6 +168,7 @@ jobs:
         run: |
           bun --version
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   setup-bun-registry:
     name: setup-bun registry (${{ matrix.os }})
@@ -175,6 +176,10 @@ jobs:
   setup-bun-jsr-registry:
     name: setup-bun jsr registry (${{ matrix.os }})
 >>>>>>> 9de686f (ci: jsr registry test)
+=======
+  setup-bun-registry:
+    name: setup-bun registry (${{ matrix.os }})
+>>>>>>> 8903e88 (ci: test)
     runs-on: ${{ matrix.os }}
     continue-on-error: true
     needs: [remove-cache, tests]
@@ -196,6 +201,7 @@ jobs:
           registries: |
             [
               {
+<<<<<<< HEAD
 <<<<<<< HEAD
                 "url": "https://username:password@registry.myorg.com/",
                 "scope": "@myorg"
@@ -215,3 +221,9 @@ jobs:
 =======
           bun add @luca/runtime-detector
 >>>>>>> 9de686f (ci: jsr registry test)
+=======
+                "url": "https://registry.npmjs.org",
+                "scope": "@npm"
+              }
+            ]
+>>>>>>> 8903e88 (ci: test)