diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
index 87bcf6e3e3..31ff7e158c 100755
--- a/.github/workflows/ci.generate.ts
+++ b/.github/workflows/ci.generate.ts
@@ -5,7 +5,11 @@ import * as yaml from "https://deno.land/std@0.173.0/encoding/yaml.ts";
// 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 = 66;
+=======
+const cacheVersion = 67;
+>>>>>>> 6af25c059 (1.39.2 (#21791))
const ubuntuRunner = "ubuntu-22.04";
const ubuntuXlRunner = "ubuntu-22.04-xl";
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6c20e37799..4a6f637f4e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -329,8 +329,13 @@ jobs:
path: |-
~/.cargo/registry/index
~/.cargo/registry/cache
+<<<<<<< HEAD
key: '66-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}'
restore-keys: '66-cargo-home-${{ matrix.os }}'
+=======
+ key: '67-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}'
+ restore-keys: '67-cargo-home-${{ matrix.os }}'
+>>>>>>> 6af25c059 (1.39.2 (#21791))
if: '!(matrix.skip)'
- name: Restore cache build output (PR)
uses: actions/cache/restore@v3
@@ -342,7 +347,11 @@ jobs:
!./target/*/*.zip
!./target/*/*.tar.gz
key: never_saved
+<<<<<<< HEAD
restore-keys: '66-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-'
+=======
+ restore-keys: '67-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-'
+>>>>>>> 6af25c059 (1.39.2 (#21791))
- name: Apply and update mtime cache
if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))'
uses: ./.github/mtime_cache
@@ -639,7 +648,11 @@ jobs:
!./target/*/gn_out
!./target/*/*.zip
!./target/*/*.tar.gz
+<<<<<<< HEAD
key: '66-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
+=======
+ key: '67-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
+>>>>>>> 6af25c059 (1.39.2 (#21791))
publish-canary:
name: publish canary
runs-on: ubuntu-22.04
diff --git a/Cargo.lock b/Cargo.lock
index 0cf53d7bce..fce1e2e46f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -918,7 +918,11 @@ dependencies = [
[[package]]
name = "deno"
+<<<<<<< HEAD
version = "1.39.1"
+=======
+version = "1.39.2"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"async-trait",
"base32",
@@ -1062,7 +1066,11 @@ dependencies = [
[[package]]
name = "deno_bench_util"
+<<<<<<< HEAD
version = "0.123.0"
+=======
+version = "0.124.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"bencher",
"deno_core",
@@ -1072,7 +1080,11 @@ dependencies = [
[[package]]
name = "deno_broadcast_channel"
+<<<<<<< HEAD
version = "0.123.0"
+=======
+version = "0.124.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"async-trait",
"deno_core",
@@ -1082,7 +1094,11 @@ dependencies = [
[[package]]
name = "deno_cache"
+<<<<<<< HEAD
version = "0.61.0"
+=======
+version = "0.62.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"async-trait",
"deno_core",
@@ -1129,7 +1145,11 @@ dependencies = [
[[package]]
name = "deno_console"
+<<<<<<< HEAD
version = "0.129.0"
+=======
+version = "0.130.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"deno_core",
]
@@ -1166,7 +1186,11 @@ dependencies = [
[[package]]
name = "deno_cron"
+<<<<<<< HEAD
version = "0.9.0"
+=======
+version = "0.10.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"anyhow",
"async-trait",
@@ -1179,7 +1203,11 @@ dependencies = [
[[package]]
name = "deno_crypto"
+<<<<<<< HEAD
version = "0.143.0"
+=======
+version = "0.144.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"aes",
"aes-gcm",
@@ -1253,7 +1281,11 @@ dependencies = [
[[package]]
name = "deno_fetch"
+<<<<<<< HEAD
version = "0.153.0"
+=======
+version = "0.154.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"bytes",
"data-url",
@@ -1271,7 +1303,11 @@ dependencies = [
[[package]]
name = "deno_ffi"
+<<<<<<< HEAD
version = "0.116.0"
+=======
+version = "0.117.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"deno_core",
"dlopen2",
@@ -1287,7 +1323,11 @@ dependencies = [
[[package]]
name = "deno_fs"
+<<<<<<< HEAD
version = "0.39.0"
+=======
+version = "0.40.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"async-trait",
"deno_core",
@@ -1330,7 +1370,11 @@ dependencies = [
[[package]]
name = "deno_http"
+<<<<<<< HEAD
version = "0.126.0"
+=======
+version = "0.127.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"async-compression",
"async-trait",
@@ -1369,7 +1413,11 @@ dependencies = [
[[package]]
name = "deno_io"
+<<<<<<< HEAD
version = "0.39.0"
+=======
+version = "0.40.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"async-trait",
"deno_core",
@@ -1382,7 +1430,11 @@ dependencies = [
[[package]]
name = "deno_kv"
+<<<<<<< HEAD
version = "0.37.0"
+=======
+version = "0.38.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"anyhow",
"async-trait",
@@ -1454,7 +1506,11 @@ dependencies = [
[[package]]
name = "deno_napi"
+<<<<<<< HEAD
version = "0.59.0"
+=======
+version = "0.60.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"deno_core",
"libloading 0.7.4",
@@ -1475,7 +1531,11 @@ dependencies = [
[[package]]
name = "deno_net"
+<<<<<<< HEAD
version = "0.121.0"
+=======
+version = "0.122.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"deno_core",
"deno_tls",
@@ -1492,7 +1552,11 @@ dependencies = [
[[package]]
name = "deno_node"
+<<<<<<< HEAD
version = "0.66.0"
+=======
+version = "0.67.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"aead-gcm-stream",
"aes",
@@ -1591,7 +1655,11 @@ dependencies = [
[[package]]
name = "deno_runtime"
+<<<<<<< HEAD
version = "0.137.0"
+=======
+version = "0.138.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"console_static_text",
"deno_ast",
@@ -1682,7 +1750,11 @@ dependencies = [
[[package]]
name = "deno_tls"
+<<<<<<< HEAD
version = "0.116.0"
+=======
+version = "0.117.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"deno_core",
"deno_native_certs",
@@ -1714,7 +1786,11 @@ dependencies = [
[[package]]
name = "deno_url"
+<<<<<<< HEAD
version = "0.129.0"
+=======
+version = "0.130.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"deno_bench_util",
"deno_console",
@@ -1726,7 +1802,11 @@ dependencies = [
[[package]]
name = "deno_web"
+<<<<<<< HEAD
version = "0.160.0"
+=======
+version = "0.161.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"async-trait",
"base64-simd",
@@ -1747,7 +1827,11 @@ dependencies = [
[[package]]
name = "deno_webgpu"
+<<<<<<< HEAD
version = "0.96.0"
+=======
+version = "0.97.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"deno_core",
"raw-window-handle",
@@ -1760,7 +1844,11 @@ dependencies = [
[[package]]
name = "deno_webidl"
+<<<<<<< HEAD
version = "0.129.0"
+=======
+version = "0.130.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"deno_bench_util",
"deno_core",
@@ -1768,7 +1856,11 @@ dependencies = [
[[package]]
name = "deno_websocket"
+<<<<<<< HEAD
version = "0.134.0"
+=======
+version = "0.135.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"bytes",
"deno_core",
@@ -1788,7 +1880,11 @@ dependencies = [
[[package]]
name = "deno_webstorage"
+<<<<<<< HEAD
version = "0.124.0"
+=======
+version = "0.125.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"deno_core",
"deno_web",
@@ -3770,7 +3866,11 @@ dependencies = [
[[package]]
name = "napi_sym"
+<<<<<<< HEAD
version = "0.59.0"
+=======
+version = "0.60.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
dependencies = [
"proc-macro2",
"quote",
diff --git a/Cargo.toml b/Cargo.toml
index 92f77c3f29..1ac8aaf2df 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,9 +43,15 @@ repository = "https://github.com/denoland/deno"
deno_ast = { version = "0.31.6", features = ["transpiling"] }
deno_core = { version = "0.243.0" }
+<<<<<<< HEAD
deno_runtime = { version = "0.137.0", path = "./runtime" }
napi_sym = { version = "0.59.0", path = "./cli/napi/sym" }
deno_bench_util = { version = "0.123.0", path = "./bench_util" }
+=======
+deno_runtime = { version = "0.138.0", path = "./runtime" }
+napi_sym = { version = "0.60.0", path = "./cli/napi/sym" }
+deno_bench_util = { version = "0.124.0", path = "./bench_util" }
+>>>>>>> 6af25c059 (1.39.2 (#21791))
test_util = { path = "./test_util" }
deno_lockfile = "0.17.2"
deno_media_type = { version = "0.1.1", features = ["module_specifier"] }
@@ -56,6 +62,7 @@ denokv_sqlite = { default-features = false, version = "0.5.0" }
denokv_remote = "0.5.0"
# exts
+<<<<<<< HEAD
deno_broadcast_channel = { version = "0.123.0", path = "./ext/broadcast_channel" }
deno_cache = { version = "0.61.0", path = "./ext/cache" }
deno_console = { version = "0.129.0", path = "./ext/console" }
@@ -77,6 +84,29 @@ deno_webidl = { version = "0.129.0", path = "./ext/webidl" }
deno_websocket = { version = "0.134.0", path = "./ext/websocket" }
deno_webstorage = { version = "0.124.0", path = "./ext/webstorage" }
deno_napi = { version = "0.59.0", path = "./ext/napi" }
+=======
+deno_broadcast_channel = { version = "0.124.0", path = "./ext/broadcast_channel" }
+deno_cache = { version = "0.62.0", path = "./ext/cache" }
+deno_console = { version = "0.130.0", path = "./ext/console" }
+deno_cron = { version = "0.10.0", path = "./ext/cron" }
+deno_crypto = { version = "0.144.0", path = "./ext/crypto" }
+deno_fetch = { version = "0.154.0", path = "./ext/fetch" }
+deno_ffi = { version = "0.117.0", path = "./ext/ffi" }
+deno_fs = { version = "0.40.0", path = "./ext/fs" }
+deno_http = { version = "0.127.0", path = "./ext/http" }
+deno_io = { version = "0.40.0", path = "./ext/io" }
+deno_net = { version = "0.122.0", path = "./ext/net" }
+deno_node = { version = "0.67.0", path = "./ext/node" }
+deno_kv = { version = "0.38.0", path = "./ext/kv" }
+deno_tls = { version = "0.117.0", path = "./ext/tls" }
+deno_url = { version = "0.130.0", path = "./ext/url" }
+deno_web = { version = "0.161.0", path = "./ext/web" }
+deno_webgpu = { version = "0.97.0", path = "./ext/webgpu" }
+deno_webidl = { version = "0.130.0", path = "./ext/webidl" }
+deno_websocket = { version = "0.135.0", path = "./ext/websocket" }
+deno_webstorage = { version = "0.125.0", path = "./ext/webstorage" }
+deno_napi = { version = "0.60.0", path = "./ext/napi" }
+>>>>>>> 6af25c059 (1.39.2 (#21791))
aes = "=0.8.3"
anyhow = "1.0.57"
diff --git a/Releases.md b/Releases.md
index 46e5d5bdcc..80640ece5e 100644
--- a/Releases.md
+++ b/Releases.md
@@ -6,6 +6,47 @@ https://github.com/denoland/deno/releases
We also have one-line install commands at:
https://github.com/denoland/deno_install
+<<<<<<< HEAD
+=======
+### 1.39.2 / 2024.01.04
+
+- Revert "fix(runtime): Make native modal keyboard interaction consistent with
+ browsers" (#21739)
+- feat(lsp): allow to connect V8 inspector (#21482)
+- feat(lsp): cache jsxImportSource automatically (#21687)
+- feat(unstable): only allow http2 for kv remote backend (#21616)
+- fix(ci): copyright year for console_test.ts (#21787)
+- fix(cli): harden permission stdio check (#21778)
+- fix(cli): make signals tests more reliable (#21772)
+- fix(cli): respect `exclude` option for `deno check` command (#21779)
+- fix(ext/http): use arraybuffer binaryType for server websocket (#21741)
+- fix(ext/node): Implement `aes-192-ecb` and `aes-256-ecb` (#21710)
+- fix(ext/node): UdpSocket ref and unref (#21777)
+- fix(ext/node): add ClientRequest#setNoDelay (#21694)
+- fix(ext/node): add process.abort() (#21742)
+- fix(ext/node): implement os.machine (#21751)
+- fix(ext/node): querystring stringify without encode callback (#21740)
+- fix(ext/node): use node:process in _streams.mjs (#21755)
+- fix(http_client): Fix Deno.createHttpClient to accept poolIdleTimeout
+ parameter (#21603)
+- fix(jupyter): error message when install fails due to jupyter command not
+ being on PATH (#21767)
+- fix(lsp): support test code lens for Deno.test.{ignore,only}() (#21775)
+- fix(node): Implement os.cpus() (#21697)
+- fix(node): support nested tests in "node:test" (#21717)
+- fix(node/zlib): accept dataview and buffer in zlib bindings (#21756)
+- fix(node/zlib): cast Dataview and Buffer to uint8 (#21746)
+- fix(node/zlib): consistently return buffer (#21747)
+- fix(unstable): kv watch should stop when db is closed (#21665)
+- fix(unstable/byonm): support using an import map with byonm (#21786)
+- fix: `Object.groupBy` return type should be a partial (#21680)
+- fix: allow npm: specifiers in import.meta.resolve (#21716)
+- fix: strict type check for cross realms (#21669)
+- perf(coverage): faster source mapping (#21783)
+- perf(lsp): use LanguageServiceHost::getProjectVersion() (#21719)
+- perf: remove opAsync (#21690)
+
+>>>>>>> 6af25c059 (1.39.2 (#21791))
### 1.39.1 / 2023.12.21
- fix(bench): added group banner to bench output. (#21551)
diff --git a/bench_util/Cargo.toml b/bench_util/Cargo.toml
index 0597a01a80..7cf5b405b1 100644
--- a/bench_util/Cargo.toml
+++ b/bench_util/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_bench_util"
+<<<<<<< HEAD
version = "0.123.0"
+=======
+version = "0.124.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index dc9bd1228b..b46a20b4ac 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno"
+<<<<<<< HEAD
version = "1.39.1"
+=======
+version = "1.39.2"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
default-run = "deno"
edition.workspace = true
diff --git a/cli/deno_std.rs b/cli/deno_std.rs
index d4b70588fe..69b2f23a91 100644
--- a/cli/deno_std.rs
+++ b/cli/deno_std.rs
@@ -2,4 +2,8 @@
// WARNING: Ensure this is the only deno_std version reference as this
// is automatically updated by the version bump workflow.
+<<<<<<< HEAD
pub const CURRENT_STD_URL_STR: &str = "https://deno.land/std@0.210.0/";
+=======
+pub const CURRENT_STD_URL_STR: &str = "https://deno.land/std@0.211.0/";
+>>>>>>> 6af25c059 (1.39.2 (#21791))
diff --git a/cli/napi/sym/Cargo.toml b/cli/napi/sym/Cargo.toml
index 771f190fcf..35ef676c8b 100644
--- a/cli/napi/sym/Cargo.toml
+++ b/cli/napi/sym/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "napi_sym"
+<<<<<<< HEAD
version = "0.59.0"
+=======
+version = "0.60.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/broadcast_channel/Cargo.toml b/ext/broadcast_channel/Cargo.toml
index 33ddc45c17..09f74eb7f9 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.123.0"
+=======
+version = "0.124.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/cache/Cargo.toml b/ext/cache/Cargo.toml
index fe2745d12d..67cde5d197 100644
--- a/ext/cache/Cargo.toml
+++ b/ext/cache/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_cache"
+<<<<<<< HEAD
version = "0.61.0"
+=======
+version = "0.62.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/console/Cargo.toml b/ext/console/Cargo.toml
index 3faa5733e5..d60acdf281 100644
--- a/ext/console/Cargo.toml
+++ b/ext/console/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_console"
+<<<<<<< HEAD
version = "0.129.0"
+=======
+version = "0.130.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/cron/Cargo.toml b/ext/cron/Cargo.toml
index c99dfa2b03..cb83666f50 100644
--- a/ext/cron/Cargo.toml
+++ b/ext/cron/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_cron"
+<<<<<<< HEAD
version = "0.9.0"
+=======
+version = "0.10.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/crypto/Cargo.toml b/ext/crypto/Cargo.toml
index 9886f5c648..7070a2d142 100644
--- a/ext/crypto/Cargo.toml
+++ b/ext/crypto/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_crypto"
+<<<<<<< HEAD
version = "0.143.0"
+=======
+version = "0.144.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml
index 3b31d1f9ac..1cd5f227a9 100644
--- a/ext/fetch/Cargo.toml
+++ b/ext/fetch/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_fetch"
+<<<<<<< HEAD
version = "0.153.0"
+=======
+version = "0.154.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/ffi/Cargo.toml b/ext/ffi/Cargo.toml
index 3e7cb6d64c..51e459c9a2 100644
--- a/ext/ffi/Cargo.toml
+++ b/ext/ffi/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_ffi"
+<<<<<<< HEAD
version = "0.116.0"
+=======
+version = "0.117.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/fs/Cargo.toml b/ext/fs/Cargo.toml
index 2261aa3bf1..0ae1041597 100644
--- a/ext/fs/Cargo.toml
+++ b/ext/fs/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_fs"
+<<<<<<< HEAD
version = "0.39.0"
+=======
+version = "0.40.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/http/Cargo.toml b/ext/http/Cargo.toml
index 8d6e16048a..d2cd20aa25 100644
--- a/ext/http/Cargo.toml
+++ b/ext/http/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_http"
+<<<<<<< HEAD
version = "0.126.0"
+=======
+version = "0.127.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/io/Cargo.toml b/ext/io/Cargo.toml
index 60d8091c27..69fb709f2a 100644
--- a/ext/io/Cargo.toml
+++ b/ext/io/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_io"
+<<<<<<< HEAD
version = "0.39.0"
+=======
+version = "0.40.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/kv/Cargo.toml b/ext/kv/Cargo.toml
index 78f7fa1987..371bfae342 100644
--- a/ext/kv/Cargo.toml
+++ b/ext/kv/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_kv"
+<<<<<<< HEAD
version = "0.37.0"
+=======
+version = "0.38.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/napi/Cargo.toml b/ext/napi/Cargo.toml
index df6bb93046..b4594f91c6 100644
--- a/ext/napi/Cargo.toml
+++ b/ext/napi/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_napi"
+<<<<<<< HEAD
version = "0.59.0"
+=======
+version = "0.60.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/net/Cargo.toml b/ext/net/Cargo.toml
index 482405542c..0ff7c07ef6 100644
--- a/ext/net/Cargo.toml
+++ b/ext/net/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_net"
+<<<<<<< HEAD
version = "0.121.0"
+=======
+version = "0.122.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/node/Cargo.toml b/ext/node/Cargo.toml
index 5116e9fc92..f21f3bf1be 100644
--- a/ext/node/Cargo.toml
+++ b/ext/node/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_node"
+<<<<<<< HEAD
version = "0.66.0"
+=======
+version = "0.67.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/tls/Cargo.toml b/ext/tls/Cargo.toml
index 3244c9974d..6c3a20641d 100644
--- a/ext/tls/Cargo.toml
+++ b/ext/tls/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_tls"
+<<<<<<< HEAD
version = "0.116.0"
+=======
+version = "0.117.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/url/Cargo.toml b/ext/url/Cargo.toml
index 556ebbb540..96c75267fb 100644
--- a/ext/url/Cargo.toml
+++ b/ext/url/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_url"
+<<<<<<< HEAD
version = "0.129.0"
+=======
+version = "0.130.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/web/Cargo.toml b/ext/web/Cargo.toml
index e7d1f87260..39628dfffc 100644
--- a/ext/web/Cargo.toml
+++ b/ext/web/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_web"
+<<<<<<< HEAD
version = "0.160.0"
+=======
+version = "0.161.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/webgpu/Cargo.toml b/ext/webgpu/Cargo.toml
index df1c819178..2998c9a8ca 100644
--- a/ext/webgpu/Cargo.toml
+++ b/ext/webgpu/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_webgpu"
+<<<<<<< HEAD
version = "0.96.0"
+=======
+version = "0.97.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors = ["the Deno authors"]
edition.workspace = true
license = "MIT"
diff --git a/ext/webidl/Cargo.toml b/ext/webidl/Cargo.toml
index 1dd68ecd6b..07d16b105a 100644
--- a/ext/webidl/Cargo.toml
+++ b/ext/webidl/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_webidl"
+<<<<<<< HEAD
version = "0.129.0"
+=======
+version = "0.130.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/websocket/Cargo.toml b/ext/websocket/Cargo.toml
index dd69350985..edfbc6624d 100644
--- a/ext/websocket/Cargo.toml
+++ b/ext/websocket/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_websocket"
+<<<<<<< HEAD
version = "0.134.0"
+=======
+version = "0.135.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/webstorage/Cargo.toml b/ext/webstorage/Cargo.toml
index 507df7c27f..f41a4e83d4 100644
--- a/ext/webstorage/Cargo.toml
+++ b/ext/webstorage/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_webstorage"
+<<<<<<< HEAD
version = "0.124.0"
+=======
+version = "0.125.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 043899ecf1..9a0bdd6ef7 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_runtime"
+<<<<<<< HEAD
version = "0.137.0"
+=======
+version = "0.138.0"
+>>>>>>> 6af25c059 (1.39.2 (#21791))
authors.workspace = true
edition.workspace = true
license.workspace = true