Merge conflicts

web3 · spacesailor24 · Aug 26, 2021 · May 14, 2021 · May 17, 2021 · May 21, 2021
commit 65e3e3bba15ff2f88edd1e493c4ac4f058c5f976
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/dist/web3.min.js.map b/dist/web3.min.js.map
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.5.0",
+  "version": "1.5.1",
   "lerna": "2.0.0",
   "command": {
     "init": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/web3-core-helpers/package-lock.json b/packages/web3-core-helpers/package-lock.json
diff --git a/packages/web3-core-helpers/package.json b/packages/web3-core-helpers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "web3-core-helpers",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "description": "Web3 core tools helper for sub packages. This is an internal package.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-helpers",
     "license": "LGPL-3.0",
@@ -14,8 +14,8 @@
     },
     "main": "lib/index.js",
     "dependencies": {
-        "web3-eth-iban": "1.5.0",
-        "web3-utils": "1.5.0"
+        "web3-eth-iban": "1.5.1",
+        "web3-utils": "1.5.1"
     },
     "devDependencies": {
         "@types/node": "^12.12.6",