From c96b71ba0ec8b7b325528a5db40bbe23416629d6 Mon Sep 17 00:00:00 2001
From: denobot <33910674+denobot@users.noreply.github.com>
Date: Wed, 22 May 2024 08:34:09 +0900
Subject: [PATCH] Cherry-pick version bump commit with conflicts

---
 .github/workflows/ci.generate.ts       |   4 +
 .github/workflows/ci.yml               |  13 +++
 Cargo.lock                             | 111 +++++++++++++++++++++++++
 Cargo.toml                             |  35 ++++++++
 Releases.md                            |  25 ++++++
 bench_util/Cargo.toml                  |   4 +
 cli/Cargo.toml                         |   4 +
 cli/args/flags.rs                      |  26 ++++++
 cli/args/mod.rs                        |   8 ++
 cli/napi/sym/Cargo.toml                |   4 +
 cli/worker.rs                          |  12 +++
 ext/broadcast_channel/Cargo.toml       |   4 +
 ext/cache/Cargo.toml                   |   4 +
 ext/canvas/Cargo.toml                  |   4 +
 ext/console/Cargo.toml                 |   4 +
 ext/cron/Cargo.toml                    |   4 +
 ext/crypto/Cargo.toml                  |   4 +
 ext/fetch/Cargo.toml                   |   4 +
 ext/ffi/Cargo.toml                     |   4 +
 ext/fs/Cargo.toml                      |   4 +
 ext/http/Cargo.toml                    |   4 +
 ext/io/Cargo.toml                      |   4 +
 ext/kv/Cargo.toml                      |   4 +
 ext/napi/Cargo.toml                    |   4 +
 ext/net/Cargo.toml                     |   4 +
 ext/node/Cargo.toml                    |   4 +
 ext/node/lib.rs                        |   3 +
 ext/node/ops/mod.rs                    |   3 +
 ext/node/polyfills/buffer.ts           |   3 +
 ext/node/polyfills/internal/buffer.mjs |  15 ++++
 ext/node/polyfills/internal/errors.ts  |   6 ++
 ext/tls/Cargo.toml                     |   4 +
 ext/url/Cargo.toml                     |   4 +
 ext/web/Cargo.toml                     |   4 +
 ext/webgpu/Cargo.toml                  |   4 +
 ext/webidl/Cargo.toml                  |   4 +
 ext/websocket/Cargo.toml               |   4 +
 ext/webstorage/Cargo.toml              |   4 +
 runtime/Cargo.toml                     |   4 +
 runtime/permissions/Cargo.toml         |   4 +
 runtime/worker_bootstrap.rs            |  12 +++
 tests/Cargo.toml                       |   3 +
 tests/integration/mod.rs               |   3 +
 tests/node_compat/config.jsonc         |   4 +
 tests/node_compat/runner/TODO.md       |   5 ++
 tools/copyright_checker.js             |   3 +
 46 files changed, 402 insertions(+)

diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
index 52dea140645761..1031b9831b2fbd 100755
--- a/.github/workflows/ci.generate.ts
+++ b/.github/workflows/ci.generate.ts
@@ -5,7 +5,11 @@ import { stringify } from "jsr:@std/yaml@^0.221/stringify";
 // Bump this number when you want to purge the cache.
 // Note: the tools/release/01_bump_crate_versions.ts script will update this version
 // automatically via regex, so ensure that this line maintains this format.
+<<<<<<< HEAD
 const cacheVersion = 92;
+=======
+const cacheVersion = 93;
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 
 const ubuntuX86Runner = "ubuntu-22.04";
 const ubuntuX86XlRunner = "ubuntu-22.04-xl";
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a4ba5ab4c607f0..6ab03d3519596c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -367,8 +367,13 @@ jobs:
           path: |-
             ~/.cargo/registry/index
             ~/.cargo/registry/cache
+<<<<<<< HEAD
           key: '92-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
           restore-keys: '92-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
+=======
+          key: '93-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
+          restore-keys: '93-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
         if: '!(matrix.skip)'
       - name: Restore cache build output (PR)
         uses: actions/cache/restore@v4
@@ -380,7 +385,11 @@ jobs:
             !./target/*/*.zip
             !./target/*/*.tar.gz
           key: never_saved
+<<<<<<< HEAD
           restore-keys: '92-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
+=======
+          restore-keys: '93-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
       - name: Apply and update mtime cache
         if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))'
         uses: ./.github/mtime_cache
@@ -669,7 +678,11 @@ jobs:
             !./target/*/gn_out
             !./target/*/*.zip
             !./target/*/*.tar.gz
+<<<<<<< HEAD
           key: '92-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
+=======
+          key: '93-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
   publish-canary:
     name: publish canary
     runs-on: ubuntu-22.04
diff --git a/Cargo.lock b/Cargo.lock
index 37b3f500c8a43c..421b8f8e59d869 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -711,7 +711,10 @@ dependencies = [
  "once_cell",
  "os_pipe",
  "pretty_assertions",
+<<<<<<< HEAD
  "regex",
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
  "serde",
  "test_server",
  "tokio",
@@ -1073,7 +1076,11 @@ dependencies = [
 
 [[package]]
 name = "deno"
+<<<<<<< HEAD
 version = "1.43.5"
+=======
+version = "1.43.6"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "async-trait",
  "base32",
@@ -1218,7 +1225,11 @@ dependencies = [
 
 [[package]]
 name = "deno_bench_util"
+<<<<<<< HEAD
 version = "0.146.0"
+=======
+version = "0.147.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "bencher",
  "deno_core",
@@ -1227,7 +1238,11 @@ dependencies = [
 
 [[package]]
 name = "deno_broadcast_channel"
+<<<<<<< HEAD
 version = "0.146.0"
+=======
+version = "0.147.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "async-trait",
  "deno_core",
@@ -1237,7 +1252,11 @@ dependencies = [
 
 [[package]]
 name = "deno_cache"
+<<<<<<< HEAD
 version = "0.84.0"
+=======
+version = "0.85.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "async-trait",
  "deno_core",
@@ -1268,7 +1287,11 @@ dependencies = [
 
 [[package]]
 name = "deno_canvas"
+<<<<<<< HEAD
 version = "0.21.0"
+=======
+version = "0.22.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "deno_core",
  "deno_webgpu",
@@ -1296,7 +1319,11 @@ dependencies = [
 
 [[package]]
 name = "deno_console"
+<<<<<<< HEAD
 version = "0.152.0"
+=======
+version = "0.153.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "deno_core",
 ]
@@ -1340,7 +1367,11 @@ checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1"
 
 [[package]]
 name = "deno_cron"
+<<<<<<< HEAD
 version = "0.32.0"
+=======
+version = "0.33.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1352,7 +1383,11 @@ dependencies = [
 
 [[package]]
 name = "deno_crypto"
+<<<<<<< HEAD
 version = "0.166.0"
+=======
+version = "0.167.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "aes",
  "aes-gcm",
@@ -1427,7 +1462,11 @@ dependencies = [
 
 [[package]]
 name = "deno_fetch"
+<<<<<<< HEAD
 version = "0.176.0"
+=======
+version = "0.177.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "bytes",
  "data-url",
@@ -1444,7 +1483,11 @@ dependencies = [
 
 [[package]]
 name = "deno_ffi"
+<<<<<<< HEAD
 version = "0.139.0"
+=======
+version = "0.140.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "deno_core",
  "dlopen2",
@@ -1460,7 +1503,11 @@ dependencies = [
 
 [[package]]
 name = "deno_fs"
+<<<<<<< HEAD
 version = "0.62.0"
+=======
+version = "0.63.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "async-trait",
  "base32",
@@ -1507,7 +1554,11 @@ dependencies = [
 
 [[package]]
 name = "deno_http"
+<<<<<<< HEAD
 version = "0.150.0"
+=======
+version = "0.151.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "async-compression",
  "async-trait",
@@ -1546,7 +1597,11 @@ dependencies = [
 
 [[package]]
 name = "deno_io"
+<<<<<<< HEAD
 version = "0.62.0"
+=======
+version = "0.63.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "async-trait",
  "deno_core",
@@ -1562,7 +1617,11 @@ dependencies = [
 
 [[package]]
 name = "deno_kv"
+<<<<<<< HEAD
 version = "0.60.0"
+=======
+version = "0.61.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1628,7 +1687,11 @@ dependencies = [
 
 [[package]]
 name = "deno_napi"
+<<<<<<< HEAD
 version = "0.82.0"
+=======
+version = "0.83.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "deno_core",
  "libloading 0.7.4",
@@ -1649,7 +1712,11 @@ dependencies = [
 
 [[package]]
 name = "deno_net"
+<<<<<<< HEAD
 version = "0.144.0"
+=======
+version = "0.145.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "deno_core",
  "deno_tls",
@@ -1664,7 +1731,11 @@ dependencies = [
 
 [[package]]
 name = "deno_node"
+<<<<<<< HEAD
 version = "0.89.0"
+=======
+version = "0.90.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "aead-gcm-stream",
  "aes",
@@ -1768,7 +1839,11 @@ dependencies = [
 
 [[package]]
 name = "deno_permissions"
+<<<<<<< HEAD
 version = "0.12.0"
+=======
+version = "0.13.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "deno_core",
  "deno_terminal",
@@ -1783,7 +1858,11 @@ dependencies = [
 
 [[package]]
 name = "deno_runtime"
+<<<<<<< HEAD
 version = "0.160.0"
+=======
+version = "0.161.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "deno_ast",
  "deno_broadcast_channel",
@@ -1884,7 +1963,11 @@ dependencies = [
 
 [[package]]
 name = "deno_tls"
+<<<<<<< HEAD
 version = "0.139.0"
+=======
+version = "0.140.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "deno_core",
  "deno_native_certs",
@@ -1908,7 +1991,11 @@ dependencies = [
 
 [[package]]
 name = "deno_url"
+<<<<<<< HEAD
 version = "0.152.0"
+=======
+version = "0.153.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "deno_bench_util",
  "deno_console",
@@ -1919,7 +2006,11 @@ dependencies = [
 
 [[package]]
 name = "deno_web"
+<<<<<<< HEAD
 version = "0.183.0"
+=======
+version = "0.184.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "async-trait",
  "base64-simd 0.8.0",
@@ -1939,7 +2030,11 @@ dependencies = [
 
 [[package]]
 name = "deno_webgpu"
+<<<<<<< HEAD
 version = "0.119.0"
+=======
+version = "0.120.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "deno_core",
  "raw-window-handle",
@@ -1951,7 +2046,11 @@ dependencies = [
 
 [[package]]
 name = "deno_webidl"
+<<<<<<< HEAD
 version = "0.152.0"
+=======
+version = "0.153.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "deno_bench_util",
  "deno_core",
@@ -1959,7 +2058,11 @@ dependencies = [
 
 [[package]]
 name = "deno_websocket"
+<<<<<<< HEAD
 version = "0.157.0"
+=======
+version = "0.158.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "bytes",
  "deno_core",
@@ -1979,7 +2082,11 @@ dependencies = [
 
 [[package]]
 name = "deno_webstorage"
+<<<<<<< HEAD
 version = "0.147.0"
+=======
+version = "0.148.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "deno_core",
  "deno_web",
@@ -4151,7 +4258,11 @@ dependencies = [
 
 [[package]]
 name = "napi_sym"
+<<<<<<< HEAD
 version = "0.82.0"
+=======
+version = "0.83.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 dependencies = [
  "quote",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 85dc6ebdbc0e1b..36fd7b0395ef14 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,6 +46,7 @@ repository = "https://github.com/denoland/deno"
 deno_ast = { version = "=0.38.2", features = ["transpiling"] }
 deno_core = { version = "0.280.0" }
 
+<<<<<<< HEAD
 deno_bench_util = { version = "0.146.0", path = "./bench_util" }
 deno_lockfile = "0.19.0"
 deno_media_type = { version = "0.1.4", features = ["module_specifier"] }
@@ -53,6 +54,15 @@ deno_permissions = { version = "0.12.0", path = "./runtime/permissions" }
 deno_runtime = { version = "0.160.0", path = "./runtime" }
 deno_terminal = "0.1.1"
 napi_sym = { version = "0.82.0", path = "./cli/napi/sym" }
+=======
+deno_bench_util = { version = "0.147.0", path = "./bench_util" }
+deno_lockfile = "0.19.0"
+deno_media_type = { version = "0.1.4", features = ["module_specifier"] }
+deno_permissions = { version = "0.13.0", path = "./runtime/permissions" }
+deno_runtime = { version = "0.161.0", path = "./runtime" }
+deno_terminal = "0.1.1"
+napi_sym = { version = "0.83.0", path = "./cli/napi/sym" }
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 test_util = { package = "test_server", path = "./tests/util/server" }
 
 denokv_proto = "0.5.0"
@@ -61,6 +71,7 @@ denokv_remote = "0.5.0"
 denokv_sqlite = { default-features = false, version = "0.5.0" }
 
 # exts
+<<<<<<< HEAD
 deno_broadcast_channel = { version = "0.146.0", path = "./ext/broadcast_channel" }
 deno_cache = { version = "0.84.0", path = "./ext/cache" }
 deno_canvas = { version = "0.21.0", path = "./ext/canvas" }
@@ -83,6 +94,30 @@ deno_webgpu = { version = "0.119.0", path = "./ext/webgpu" }
 deno_webidl = { version = "0.152.0", path = "./ext/webidl" }
 deno_websocket = { version = "0.157.0", path = "./ext/websocket" }
 deno_webstorage = { version = "0.147.0", path = "./ext/webstorage" }
+=======
+deno_broadcast_channel = { version = "0.147.0", path = "./ext/broadcast_channel" }
+deno_cache = { version = "0.85.0", path = "./ext/cache" }
+deno_canvas = { version = "0.22.0", path = "./ext/canvas" }
+deno_console = { version = "0.153.0", path = "./ext/console" }
+deno_cron = { version = "0.33.0", path = "./ext/cron" }
+deno_crypto = { version = "0.167.0", path = "./ext/crypto" }
+deno_fetch = { version = "0.177.0", path = "./ext/fetch" }
+deno_ffi = { version = "0.140.0", path = "./ext/ffi" }
+deno_fs = { version = "0.63.0", path = "./ext/fs" }
+deno_http = { version = "0.151.0", path = "./ext/http" }
+deno_io = { version = "0.63.0", path = "./ext/io" }
+deno_kv = { version = "0.61.0", path = "./ext/kv" }
+deno_napi = { version = "0.83.0", path = "./ext/napi" }
+deno_net = { version = "0.145.0", path = "./ext/net" }
+deno_node = { version = "0.90.0", path = "./ext/node" }
+deno_tls = { version = "0.140.0", path = "./ext/tls" }
+deno_url = { version = "0.153.0", path = "./ext/url" }
+deno_web = { version = "0.184.0", path = "./ext/web" }
+deno_webgpu = { version = "0.120.0", path = "./ext/webgpu" }
+deno_webidl = { version = "0.153.0", path = "./ext/webidl" }
+deno_websocket = { version = "0.158.0", path = "./ext/websocket" }
+deno_webstorage = { version = "0.148.0", path = "./ext/webstorage" }
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 
 aes = "=0.8.3"
 anyhow = "1.0.57"
diff --git a/Releases.md b/Releases.md
index d0340719231825..71ba522d20d966 100644
--- a/Releases.md
+++ b/Releases.md
@@ -6,6 +6,31 @@ https://github.com/denoland/deno/releases
 We also have one-line install commands at:
 https://github.com/denoland/deno_install
 
+<<<<<<< HEAD
+=======
+### 1.43.6 / 2024.05.21
+
+- fix(cli): use CliNodeResolver::resolve() for managed node_modules (#23902)
+- fix(cli/coverage): invalid line id in html reporter (#23908)
+- fix(ext/web): fix potential leak of unread buffers (#23923)
+- fix(ext/webgpu): Allow `depthClearValue` to be undefined when `depthLoadOp` is
+  not "clear" (#23850)
+- fix(lsp): Fix display of JSDoc named examples (#23927)
+- fix(lsp): apply import fix to missing declaration code action (#23924)
+- fix(node): instantiating process class without new (#23865)
+- fix(node): patch MessagePort in worker_thread message (#23871)
+- fix(node): stub findSourceMap for `ava` (#23899)
+- fix(node): track `SIG*` listeners in `process.listeners` (#23890)
+- fix(task): do not error if node_modules folder not exists (#23920)
+- fix: add missing `URL.parse` types (#23893)
+- fix: handle signal 0 in process.kill (#23473)
+- fix: serve handler error with 0 arguments (#23652)
+- perf(cache): compile ts to js in parallel for `deno cache` (#23892)
+- perf: analyze cjs exports and emit typescript in parallel (#23856)
+- perf: analyze cjs re-exports in parallel (#23894)
+- perf: resolver - skip cwd lookup if able (#23851)
+
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 ### 1.43.5 / 2024.05.18
 
 - fix(npm): regression deserializing JSON for some npm packages (#23868)
diff --git a/bench_util/Cargo.toml b/bench_util/Cargo.toml
index 3c7a1698584430..c9be4f9ffa240a 100644
--- a/bench_util/Cargo.toml
+++ b/bench_util/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_bench_util"
+<<<<<<< HEAD
 version = "0.146.0"
+=======
+version = "0.147.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index a7856b8d742170..64990733325bac 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno"
+<<<<<<< HEAD
 version = "1.43.5"
+=======
+version = "1.43.6"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 default-run = "deno"
 edition.workspace = true
diff --git a/cli/args/flags.rs b/cli/args/flags.rs
index 9de1c6057fe70c..53cc43679ee3f1 100644
--- a/cli/args/flags.rs
+++ b/cli/args/flags.rs
@@ -26,6 +26,10 @@ use serde::Serialize;
 use std::env;
 use std::ffi::OsString;
 use std::net::SocketAddr;
+<<<<<<< HEAD
+=======
+use std::num::NonZeroU16;
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 use std::num::NonZeroU32;
 use std::num::NonZeroU8;
 use std::num::NonZeroUsize;
@@ -282,7 +286,11 @@ impl RunFlags {
 pub struct ServeFlags {
   pub script: String,
   pub watch: Option<WatchFlagsWithPaths>,
+<<<<<<< HEAD
   pub port: u16,
+=======
+  pub port: NonZeroU16,
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
   pub host: String,
 }
 
@@ -292,7 +300,11 @@ impl ServeFlags {
     Self {
       script,
       watch: None,
+<<<<<<< HEAD
       port,
+=======
+      port: NonZeroU16::new(port).unwrap(),
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
       host: host.to_owned(),
     }
   }
@@ -2463,8 +2475,13 @@ fn serve_subcommand() -> Command {
     .arg(
       Arg::new("port")
         .long("port")
+<<<<<<< HEAD
         .help("The TCP port to serve on, defaulting to 8000. Pass 0 to pick a random free port.")
         .value_parser(value_parser!(u16)),
+=======
+        .help("The TCP port to serve on, defaulting to 8000.")
+        .value_parser(value_parser!(NonZeroU16)),
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
     )
     .arg(
       Arg::new("host")
@@ -4126,7 +4143,13 @@ fn serve_parse(
   app: Command,
 ) -> clap::error::Result<()> {
   // deno serve implies --allow-net=host:port
+<<<<<<< HEAD
   let port = matches.remove_one::<u16>("port").unwrap_or(8000);
+=======
+  let port = matches
+    .remove_one::<NonZeroU16>("port")
+    .unwrap_or(NonZeroU16::new(8000).unwrap());
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
   let host = matches
     .remove_one::<String>("host")
     .unwrap_or_else(|| "0.0.0.0".to_owned());
@@ -5319,6 +5342,7 @@ mod tests {
         ..Flags::default()
       }
     );
+<<<<<<< HEAD
 
     let r = flags_from_vec(svec![
       "deno",
@@ -5345,6 +5369,8 @@ mod tests {
         ..Flags::default()
       }
     );
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
   }
 
   #[test]
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index b3d508e18a236a..b9371e78e08021 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -62,6 +62,10 @@ use std::env;
 use std::io::BufReader;
 use std::io::Cursor;
 use std::net::SocketAddr;
+<<<<<<< HEAD
+=======
+use std::num::NonZeroU16;
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 use std::num::NonZeroUsize;
 use std::path::Path;
 use std::path::PathBuf;
@@ -1035,7 +1039,11 @@ impl CliOptions {
     }
   }
 
+<<<<<<< HEAD
   pub fn serve_port(&self) -> Option<u16> {
+=======
+  pub fn serve_port(&self) -> Option<NonZeroU16> {
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
     if let DenoSubcommand::Serve(flags) = self.sub_command() {
       Some(flags.port)
     } else {
diff --git a/cli/napi/sym/Cargo.toml b/cli/napi/sym/Cargo.toml
index c88b845857524c..fb8179f40f7177 100644
--- a/cli/napi/sym/Cargo.toml
+++ b/cli/napi/sym/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "napi_sym"
+<<<<<<< HEAD
 version = "0.82.0"
+=======
+version = "0.83.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/cli/worker.rs b/cli/worker.rs
index bfdeb35689e6d1..022f47dcb69e68 100644
--- a/cli/worker.rs
+++ b/cli/worker.rs
@@ -1,5 +1,9 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
+<<<<<<< HEAD
+=======
+use std::num::NonZeroU16;
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 use std::path::Path;
 use std::path::PathBuf;
 use std::rc::Rc;
@@ -147,7 +151,11 @@ struct SharedWorkerState {
   disable_deprecated_api_warning: bool,
   verbose_deprecated_api_warning: bool,
   code_cache: Option<Arc<dyn code_cache::CodeCache>>,
+<<<<<<< HEAD
   serve_port: Option<u16>,
+=======
+  serve_port: Option<NonZeroU16>,
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
   serve_host: Option<String>,
 }
 
@@ -417,7 +425,11 @@ impl CliMainWorkerFactory {
     feature_checker: Arc<FeatureChecker>,
     options: CliMainWorkerOptions,
     node_ipc: Option<i64>,
+<<<<<<< HEAD
     serve_port: Option<u16>,
+=======
+    serve_port: Option<NonZeroU16>,
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
     serve_host: Option<String>,
     enable_future_features: bool,
     disable_deprecated_api_warning: bool,
diff --git a/ext/broadcast_channel/Cargo.toml b/ext/broadcast_channel/Cargo.toml
index 086478be323fbd..9f586c0c96ccdd 100644
--- a/ext/broadcast_channel/Cargo.toml
+++ b/ext/broadcast_channel/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_broadcast_channel"
+<<<<<<< HEAD
 version = "0.146.0"
+=======
+version = "0.147.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/cache/Cargo.toml b/ext/cache/Cargo.toml
index 7e209799992897..94e4f729dd2012 100644
--- a/ext/cache/Cargo.toml
+++ b/ext/cache/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_cache"
+<<<<<<< HEAD
 version = "0.84.0"
+=======
+version = "0.85.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/canvas/Cargo.toml b/ext/canvas/Cargo.toml
index ae53774faff9f7..126e3a736beb8e 100644
--- a/ext/canvas/Cargo.toml
+++ b/ext/canvas/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_canvas"
+<<<<<<< HEAD
 version = "0.21.0"
+=======
+version = "0.22.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/console/Cargo.toml b/ext/console/Cargo.toml
index 9077fae1563c3d..2a81cde16d8b11 100644
--- a/ext/console/Cargo.toml
+++ b/ext/console/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_console"
+<<<<<<< HEAD
 version = "0.152.0"
+=======
+version = "0.153.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/cron/Cargo.toml b/ext/cron/Cargo.toml
index 304daa64c0aa61..2a331d67366ea4 100644
--- a/ext/cron/Cargo.toml
+++ b/ext/cron/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_cron"
+<<<<<<< HEAD
 version = "0.32.0"
+=======
+version = "0.33.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/crypto/Cargo.toml b/ext/crypto/Cargo.toml
index 435142c7aaf28c..a8eec3ab524d4f 100644
--- a/ext/crypto/Cargo.toml
+++ b/ext/crypto/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_crypto"
+<<<<<<< HEAD
 version = "0.166.0"
+=======
+version = "0.167.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml
index e5feca9cbd513c..324d52291390a2 100644
--- a/ext/fetch/Cargo.toml
+++ b/ext/fetch/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_fetch"
+<<<<<<< HEAD
 version = "0.176.0"
+=======
+version = "0.177.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/ffi/Cargo.toml b/ext/ffi/Cargo.toml
index 7fbcdf0398e79f..973bcdb8293a25 100644
--- a/ext/ffi/Cargo.toml
+++ b/ext/ffi/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_ffi"
+<<<<<<< HEAD
 version = "0.139.0"
+=======
+version = "0.140.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/fs/Cargo.toml b/ext/fs/Cargo.toml
index 4c3cbb7a0db2eb..d6932bbf38a3d2 100644
--- a/ext/fs/Cargo.toml
+++ b/ext/fs/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_fs"
+<<<<<<< HEAD
 version = "0.62.0"
+=======
+version = "0.63.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/http/Cargo.toml b/ext/http/Cargo.toml
index 4029a0b1c9d13d..5e3a8bd920e882 100644
--- a/ext/http/Cargo.toml
+++ b/ext/http/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_http"
+<<<<<<< HEAD
 version = "0.150.0"
+=======
+version = "0.151.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/io/Cargo.toml b/ext/io/Cargo.toml
index fd9b624fe7bf55..215e729922434a 100644
--- a/ext/io/Cargo.toml
+++ b/ext/io/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_io"
+<<<<<<< HEAD
 version = "0.62.0"
+=======
+version = "0.63.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/kv/Cargo.toml b/ext/kv/Cargo.toml
index ae7301aaf1d95e..5451b3d180fe41 100644
--- a/ext/kv/Cargo.toml
+++ b/ext/kv/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_kv"
+<<<<<<< HEAD
 version = "0.60.0"
+=======
+version = "0.61.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/napi/Cargo.toml b/ext/napi/Cargo.toml
index 3546b401fe6649..dbb8665712fa69 100644
--- a/ext/napi/Cargo.toml
+++ b/ext/napi/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_napi"
+<<<<<<< HEAD
 version = "0.82.0"
+=======
+version = "0.83.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/net/Cargo.toml b/ext/net/Cargo.toml
index c2d130eb346785..5cd986f5dac085 100644
--- a/ext/net/Cargo.toml
+++ b/ext/net/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_net"
+<<<<<<< HEAD
 version = "0.144.0"
+=======
+version = "0.145.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/node/Cargo.toml b/ext/node/Cargo.toml
index db491b31f81a42..3cf37ae044bb6c 100644
--- a/ext/node/Cargo.toml
+++ b/ext/node/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_node"
+<<<<<<< HEAD
 version = "0.89.0"
+=======
+version = "0.90.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/node/lib.rs b/ext/node/lib.rs
index 2b31f704f6f4e5..f872041784deb5 100644
--- a/ext/node/lib.rs
+++ b/ext/node/lib.rs
@@ -186,8 +186,11 @@ deno_core::extension!(deno_node,
   deps = [ deno_io, deno_fs ],
   parameters = [P: NodePermissions],
   ops = [
+<<<<<<< HEAD
     ops::buffer::op_is_ascii,
     ops::buffer::op_is_utf8,
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
     ops::crypto::op_node_create_decipheriv,
     ops::crypto::op_node_cipheriv_encrypt,
     ops::crypto::op_node_cipheriv_final,
diff --git a/ext/node/ops/mod.rs b/ext/node/ops/mod.rs
index ae703e3f36d2bd..c4676e040fb196 100644
--- a/ext/node/ops/mod.rs
+++ b/ext/node/ops/mod.rs
@@ -1,6 +1,9 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
+<<<<<<< HEAD
 pub mod buffer;
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 pub mod crypto;
 pub mod fs;
 pub mod http;
diff --git a/ext/node/polyfills/buffer.ts b/ext/node/polyfills/buffer.ts
index c5a910cb401706..d9ec4868ce6894 100644
--- a/ext/node/polyfills/buffer.ts
+++ b/ext/node/polyfills/buffer.ts
@@ -7,8 +7,11 @@ export {
   Buffer,
   constants,
   default,
+<<<<<<< HEAD
   isAscii,
   isUtf8,
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
   kMaxLength,
   kStringMaxLength,
   SlowBuffer,
diff --git a/ext/node/polyfills/internal/buffer.mjs b/ext/node/polyfills/internal/buffer.mjs
index 0521c56aaa487b..c80fc10978c2f9 100644
--- a/ext/node/polyfills/internal/buffer.mjs
+++ b/ext/node/polyfills/internal/buffer.mjs
@@ -6,7 +6,10 @@
 // deno-lint-ignore-file prefer-primordials
 
 import { core } from "ext:core/mod.js";
+<<<<<<< HEAD
 import { op_is_ascii, op_is_utf8 } from "ext:core/ops";
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 
 import { TextDecoder, TextEncoder } from "ext:deno_web/08_text_encoding.js";
 import { codes } from "ext:deno_node/internal/error_codes.ts";
@@ -27,12 +30,18 @@ import {
 import {
   isAnyArrayBuffer,
   isArrayBufferView,
+<<<<<<< HEAD
   isTypedArray,
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 } from "ext:deno_node/internal/util/types.ts";
 import { normalizeEncoding } from "ext:deno_node/internal/util.mjs";
 import { validateBuffer } from "ext:deno_node/internal/validators.mjs";
 import { isUint8Array } from "ext:deno_node/internal/util/types.ts";
+<<<<<<< HEAD
 import { ERR_INVALID_STATE } from "ext:deno_node/internal/errors.ts";
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 import {
   forgivingBase64Encode,
   forgivingBase64UrlEncode,
@@ -2539,6 +2548,7 @@ export function writeU_Int24LE(buf, value, offset, min, max) {
   return offset;
 }
 
+<<<<<<< HEAD
 export function isUtf8(input) {
   if (isTypedArray(input)) {
     if (input.buffer.detached) {
@@ -2583,14 +2593,19 @@ export function isAscii(input) {
   ], input);
 }
 
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 export default {
   atob,
   btoa,
   Blob,
   Buffer,
   constants,
+<<<<<<< HEAD
   isAscii,
   isUtf8,
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
   kMaxLength,
   kStringMaxLength,
   SlowBuffer,
diff --git a/ext/node/polyfills/internal/errors.ts b/ext/node/polyfills/internal/errors.ts
index a16656087ef741..24f5f4e847a1b0 100644
--- a/ext/node/polyfills/internal/errors.ts
+++ b/ext/node/polyfills/internal/errors.ts
@@ -2564,12 +2564,15 @@ export class ERR_HTTP_SOCKET_ASSIGNED extends NodeError {
   }
 }
 
+<<<<<<< HEAD
 export class ERR_INVALID_STATE extends NodeError {
   constructor(message: string) {
     super("ERR_INVALID_STATE", `Invalid state: ${message}`);
   }
 }
 
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 interface UvExceptionContext {
   syscall: string;
   path?: string;
@@ -2830,7 +2833,10 @@ export default {
   ERR_INVALID_RETURN_PROPERTY,
   ERR_INVALID_RETURN_PROPERTY_VALUE,
   ERR_INVALID_RETURN_VALUE,
+<<<<<<< HEAD
   ERR_INVALID_STATE,
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
   ERR_INVALID_SYNC_FORK_INPUT,
   ERR_INVALID_THIS,
   ERR_INVALID_TUPLE,
diff --git a/ext/tls/Cargo.toml b/ext/tls/Cargo.toml
index 3c182c76d7b9ef..b71cf50e697eca 100644
--- a/ext/tls/Cargo.toml
+++ b/ext/tls/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_tls"
+<<<<<<< HEAD
 version = "0.139.0"
+=======
+version = "0.140.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/url/Cargo.toml b/ext/url/Cargo.toml
index 14563bc6e086e6..b5960c2e6eccc2 100644
--- a/ext/url/Cargo.toml
+++ b/ext/url/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_url"
+<<<<<<< HEAD
 version = "0.152.0"
+=======
+version = "0.153.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/web/Cargo.toml b/ext/web/Cargo.toml
index b2a570496d9d04..e02fefc0f6284a 100644
--- a/ext/web/Cargo.toml
+++ b/ext/web/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_web"
+<<<<<<< HEAD
 version = "0.183.0"
+=======
+version = "0.184.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/webgpu/Cargo.toml b/ext/webgpu/Cargo.toml
index 314ba85e2f419c..dbc6fa9bdcc996 100644
--- a/ext/webgpu/Cargo.toml
+++ b/ext/webgpu/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_webgpu"
+<<<<<<< HEAD
 version = "0.119.0"
+=======
+version = "0.120.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors = ["the Deno authors"]
 edition.workspace = true
 license = "MIT"
diff --git a/ext/webidl/Cargo.toml b/ext/webidl/Cargo.toml
index 3cb3fc726d9041..0b4a88fd429133 100644
--- a/ext/webidl/Cargo.toml
+++ b/ext/webidl/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_webidl"
+<<<<<<< HEAD
 version = "0.152.0"
+=======
+version = "0.153.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/websocket/Cargo.toml b/ext/websocket/Cargo.toml
index 4efee6f2efdbeb..e0bbe7bf1d229d 100644
--- a/ext/websocket/Cargo.toml
+++ b/ext/websocket/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_websocket"
+<<<<<<< HEAD
 version = "0.157.0"
+=======
+version = "0.158.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/ext/webstorage/Cargo.toml b/ext/webstorage/Cargo.toml
index c83cb2028c3859..20dac38ef2e662 100644
--- a/ext/webstorage/Cargo.toml
+++ b/ext/webstorage/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_webstorage"
+<<<<<<< HEAD
 version = "0.147.0"
+=======
+version = "0.148.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index f2126a13e05b91..96d414cebd0651 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_runtime"
+<<<<<<< HEAD
 version = "0.160.0"
+=======
+version = "0.161.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/runtime/permissions/Cargo.toml b/runtime/permissions/Cargo.toml
index 628c478c047ea1..2bcbfec75340b9 100644
--- a/runtime/permissions/Cargo.toml
+++ b/runtime/permissions/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_permissions"
+<<<<<<< HEAD
 version = "0.12.0"
+=======
+version = "0.13.0"
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/runtime/worker_bootstrap.rs b/runtime/worker_bootstrap.rs
index 0838da2d1a8420..60d25e99a4b05c 100644
--- a/runtime/worker_bootstrap.rs
+++ b/runtime/worker_bootstrap.rs
@@ -4,6 +4,10 @@ use deno_core::v8;
 use deno_core::ModuleSpecifier;
 use serde::Serialize;
 use std::cell::RefCell;
+<<<<<<< HEAD
+=======
+use std::num::NonZeroU16;
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 use std::thread;
 
 use deno_terminal::colors;
@@ -92,7 +96,11 @@ pub struct BootstrapOptions {
   pub future: bool,
   pub mode: WorkerExecutionMode,
   // Used by `deno serve`
+<<<<<<< HEAD
   pub serve_port: Option<u16>,
+=======
+  pub serve_port: Option<NonZeroU16>,
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
   pub serve_host: Option<String>,
 }
 
@@ -197,7 +205,11 @@ impl BootstrapOptions {
       self.verbose_deprecated_api_warning,
       self.future,
       self.mode as u8 as _,
+<<<<<<< HEAD
       self.serve_port.unwrap_or_default(),
+=======
+      self.serve_port.map(|x| x.into()).unwrap_or_default(),
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
       self.serve_host.as_deref(),
     );
 
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index af220aae7af9ee..b31311190a4a5d 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -52,7 +52,10 @@ hyper-util.workspace = true
 once_cell.workspace = true
 os_pipe.workspace = true
 pretty_assertions.workspace = true
+<<<<<<< HEAD
 regex.workspace = true
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 serde.workspace = true
 test_util.workspace = true
 tokio.workspace = true
diff --git a/tests/integration/mod.rs b/tests/integration/mod.rs
index d35fabc0277cd1..f8e0890c4520b0 100644
--- a/tests/integration/mod.rs
+++ b/tests/integration/mod.rs
@@ -60,8 +60,11 @@ mod publish;
 mod repl;
 #[path = "run_tests.rs"]
 mod run;
+<<<<<<< HEAD
 #[path = "serve_tests.rs"]
 mod serve;
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 #[path = "shared_library_tests.rs"]
 mod shared_library_tests;
 #[path = "task_tests.rs"]
diff --git a/tests/node_compat/config.jsonc b/tests/node_compat/config.jsonc
index 56f43b444fb1b5..27e3c392417699 100644
--- a/tests/node_compat/config.jsonc
+++ b/tests/node_compat/config.jsonc
@@ -179,9 +179,13 @@
       "test-buffer-includes.js",
       "test-buffer-indexof.js",
       "test-buffer-inheritance.js",
+<<<<<<< HEAD
       "test-buffer-isascii.js",
       "test-buffer-isencoding.js",
       "test-buffer-isutf8.js",
+=======
+      "test-buffer-isencoding.js",
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
       "test-buffer-iterator.js",
       "test-buffer-new.js",
       "test-buffer-no-negative-allocation.js",
diff --git a/tests/node_compat/runner/TODO.md b/tests/node_compat/runner/TODO.md
index 0bc19a076649d0..4c713359aee374 100644
--- a/tests/node_compat/runner/TODO.md
+++ b/tests/node_compat/runner/TODO.md
@@ -227,6 +227,11 @@ NOTE: This file should not be manually edited. Please edit `tests/node_compat/co
 - [parallel/test-buffer-constructor-outside-node-modules.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-constructor-outside-node-modules.js)
 - [parallel/test-buffer-fill.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-fill.js)
 - [parallel/test-buffer-inspect.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-inspect.js)
+<<<<<<< HEAD
+=======
+- [parallel/test-buffer-isascii.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-isascii.js)
+- [parallel/test-buffer-isutf8.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-isutf8.js)
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
 - [parallel/test-buffer-pending-deprecation.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-pending-deprecation.js)
 - [parallel/test-buffer-pool-untransferable.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-pool-untransferable.js)
 - [parallel/test-buffer-prototype-inspect.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-prototype-inspect.js)
diff --git a/tools/copyright_checker.js b/tools/copyright_checker.js
index 4ffde77c1b9c3f..51a57e80fbd1b9 100755
--- a/tools/copyright_checker.js
+++ b/tools/copyright_checker.js
@@ -103,7 +103,10 @@ export async function checkCopyright() {
     // show all the errors at the same time to prevent overlap with
     // other running scripts that may be outputting
     console.error(errors.join("\n"));
+<<<<<<< HEAD
     console.error(`Expected copyright:\n\`\`\`\n${COPYRIGHT_LINE}\n\`\`\``);
+=======
+>>>>>>> 7df3d5aee (1.43.6 (#23932))
     throw new Error(`Copyright checker had ${errors.length} errors.`);
   }
 }