Merge branch 'master' into next

package.json

@@ -42,14 +42,9 @@
     "abslog": "2.4.0",
     "http-cache-semantics": "^4.0.3",
     "lodash.clonedeep": "^4.5.0",
-<<<<<<< HEAD
     "ttl-mem-cache": "4.1.0",
-    "undici": "^5.10.0"
-=======
-    "readable-stream": "^4.0.0",
-    "request": "^2.88.0",
+    "undici": "^5.10.0",
     "ttl-mem-cache": "4.1.0"
->>>>>>> 9c7303a (fix(deps): update dependency readable-stream to v4)
   },
   "devDependencies": {
     "@podium/test-utils": "2.5.2",
@@ -69,16 +64,9 @@
     "express": "4.18.2",
     "get-stream": "8.0.1",
     "http-proxy": "1.18.1",
-<<<<<<< HEAD
     "is-stream": "3.0.0",
     "prettier": "3.1.0",
     "semantic-release": "22.0.8",
     "tap": "18.6.1"
-=======
-    "is-stream": "2.0.1",
-    "prettier": "3.1.0",
-    "semantic-release": "19.0.3",
-    "tap": "16.3.9"
->>>>>>> 87bcad3 (chore(deps): update dependency semantic-release to v19 [security])
   }
 }