From 7affa5ecb43539611265874ca7be9d5ea2d7d811 Mon Sep 17 00:00:00 2001
From: Dylan Conway <dylan.conway567@gmail.com>
Date: Sun, 2 Nov 2025 12:01:03 -0800
Subject: [PATCH] fix merge

---
 src/bun.js/AsyncModule.zig    | 2 --
 src/install/lockfile/Tree.zig | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/bun.js/AsyncModule.zig b/src/bun.js/AsyncModule.zig
index 7cc369fc3a..023bf4b047 100644
--- a/src/bun.js/AsyncModule.zig
+++ b/src/bun.js/AsyncModule.zig
@@ -115,7 +115,6 @@ pub const AsyncModule = struct {
                         .onPackageDownloadError = onPackageDownloadError,
                         .progress_bar = true,
                     },
-                    true,
                     PackageManager.Options.LogLevel.default,
                 ) catch unreachable;
             } else {
@@ -128,7 +127,6 @@ pub const AsyncModule = struct {
                         .onPackageManifestError = onPackageManifestError,
                         .onPackageDownloadError = onPackageDownloadError,
                     },
-                    true,
                     PackageManager.Options.LogLevel.default_no_progress,
                 ) catch unreachable;
             }
diff --git a/src/install/lockfile/Tree.zig b/src/install/lockfile/Tree.zig
index be3c2c10ff..8564032b62 100644
--- a/src/install/lockfile/Tree.zig
+++ b/src/install/lockfile/Tree.zig
@@ -617,7 +617,7 @@ pub fn processSubtree(
                         builder.resolutions[unresolved_dep_id] = pkg_id;
                     }
                 }
-                for (dependency_lists[replace.id].items) |*placed_dep_id| {
+                for (dependency_lists[replace.id.get()].items) |*placed_dep_id| {
                     if (placed_dep_id.* == replace.dep_id) {
                         placed_dep_id.* = dep_id;
                     }