docs(en): merging all conflicts

CHANGELOG.md

@@ -1,5 +1,19 @@
 # rollup changelog
 
+## 4.24.4
+
+_2024-11-04_
+
+### Bug Fixes
+
+- Ensure mutations by handlers in Proxy definitions are always respected when tree-shaking (#5713)
+
+### Pull Requests
+
+- [#5708](https://github.com/rollup/rollup/pull/5708): Update configuration-options document (@sacru2red, @lukastaegert)
+- [#5711](https://github.com/rollup/rollup/pull/5711): chore(deps): lock file maintenance minor/patch updates (@renovate[bot])
+- [#5713](https://github.com/rollup/rollup/pull/5713): fix: Deoptimize the proxied object if its property is reassigned in the handler functions (@TrickyPi)
+
 ## 4.24.3
 
 _2024-10-29_

browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/browser",
-  "version": "4.24.3",
+  "version": "4.24.4",
   "description": "Next-generation ES module bundler browser build",
   "main": "dist/rollup.browser.js",
   "module": "dist/es/rollup.browser.js",

docs/command-line-interface/index.md

@@ -330,10 +330,14 @@ export default {
 
 导入你的 package 文件可能很有用，例如自动将你的依赖项标记为 “external”。根据你的 Node 版本，有不同的方法来实现此目的：
 
+<<<<<<< HEAD
 - 对于 Node 17.5+，你可以使用导入断言
+=======
+- For Node 18.20+, you can use an import attribute
+>>>>>>> cdf34ab5411aac6ac3f6cd21b10d2e58427e88ec
 
   ```js twoslash
-  import pkg from './package.json' assert { type: 'json' };
+  import pkg from './package.json' with { type: 'json' };
 
   export default {
   	// Mark package dependencies as "external". Rest of configuration