lerna-debug.log

0 silly argv {
0 silly argv   _: [ 'run' ],
0 silly argv   scope: '@didvault/app',
0 silly argv   parallel: true,
0 silly argv   lernaVersion: '5.1.8',
0 silly argv   '$0': '/Users/zhaohuaiyuan/Desktop/code/DIDVault/node_modules/.bin/lerna',
0 silly argv   script: 'dev:desktop'
0 silly argv }
1 notice cli v5.1.8
2 verbose rootPath /Users/zhaohuaiyuan/Desktop/code/DIDVault
3 error JSONError: Unexpected token "<" (0x3C) in JSON at position 3382 while parsing near "...\"marked\": \"4.0.18\",\n<<<<<<< Updated upst..." in packages/app/package.json
3 error
3 error   82 |     "lodash.throttle": "^4.1.1",
3 error   83 |     "marked": "4.0.18",
3 error > 84 | <<<<<<< Updated upstream
3 error      | ^
3 error   85 |     "material-icons": "^1.13.9",
3 error   86 | =======
3 error   87 |     "material-icons": "^1.10.5",
3 error
3 error     at parseJson (/Users/zhaohuaiyuan/Desktop/code/DIDVault/node_modules/parse-json/index.js:29:21)
3 error     at parse (/Users/zhaohuaiyuan/Desktop/code/DIDVault/node_modules/load-json-file/index.js:15:9)
3 error     at module.exports (/Users/zhaohuaiyuan/Desktop/code/DIDVault/node_modules/load-json-file/index.js:18:47)