fix merge conflicts for package.json, update package-lock, lint

Author: ryanio

package-lock.json

@@ -1,6 +1,5 @@
 import { readFileSync } from 'fs'
 import Benchmark = require('benchmark')
-import { bufferToInt } from 'ethereumjs-util'
 import Common from '@ethereumjs/common'
 import { Block } from '@ethereumjs/block'
 import blockFromRPC from '@ethereumjs/block/dist/from-rpc'

packages/vm/benchmarks/mainnetBlocks.ts

@@ -185,8 +185,10 @@ export default async function runBlock(this: VM, opts: RunBlockOpts): Promise<Ru
   try {
     result = await applyBlock.bind(this)(block, opts)
     debug(
-      `Received block results gasUsed=${result.gasUsed} bloom=${short(result.bloom.bitvector)} (${result.bloom.bitvector.length
-      } bytes) receiptRoot=${result.receiptRoot.toString('hex')} receipts=${result.receipts.length
+      `Received block results gasUsed=${result.gasUsed} bloom=${short(result.bloom.bitvector)} (${
+        result.bloom.bitvector.length
+      } bytes) receiptRoot=${result.receiptRoot.toString('hex')} receipts=${
+        result.receipts.length
       } txResults=${result.results.length}`
     )
   } catch (err) {

packages/vm/lib/runBlock.ts

@@ -59,17 +59,9 @@
     "util.promisify": "^1.0.1"
   },
   "devDependencies": {
-<<<<<<< HEAD
     "@ethereumjs/config-coverage": "^2.0.0",
     "@ethereumjs/config-typescript": "^2.0.0",
     "@ethereumjs/eslint-config-defaults": "^2.0.0",
-=======
-    "0x": "^4.7.5",
-    "@ethereumjs/config-nyc": "^1.1.1",
-    "@ethereumjs/config-prettier": "^1.1.1",
-    "@ethereumjs/config-tsc": "^1.1.1",
-    "@ethereumjs/config-tslint": "^1.1.1",
->>>>>>> d7aee6b3... vm: integrate profiling into package.json scripts, add finalized benchmarks and profliling CL API
     "@types/benchmark": "^1.0.33",
     "@types/bn.js": "^4.11.6",
     "@types/core-js": "^2.5.0",