Merge conflicts persisting - attempt to resolve

web3.js/yarn.lock

@@ -6415,10 +6415,7 @@
   "version" "2.0.2"
 
 "nopt@*", "nopt@^5.0.0":
-<<<<<<< HEAD
   "integrity" "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="
-=======
->>>>>>> 7889487509 (fix: update method name and fix test timeout issue)
   "resolved" "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"
   "version" "5.0.0"
   dependencies:
@@ -6465,20 +6462,14 @@
   "version" "6.1.0"
 
 "npm-audit-report@*":
-<<<<<<< HEAD
   "integrity" "sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw=="
   "resolved" "https://registry.npmjs.org/npm-audit-report/-/npm-audit-report-2.1.5.tgz"
-=======
->>>>>>> 7889487509 (fix: update method name and fix test timeout issue)
   "version" "2.1.5"
   dependencies:
     "chalk" "^4.0.0"
 
 "npm-bundled@^1.1.1":
-<<<<<<< HEAD
   "integrity" "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ=="
-=======
->>>>>>> 7889487509 (fix: update method name and fix test timeout issue)
   "resolved" "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz"
   "version" "1.1.2"
   dependencies: