lerna-debug.log

0 silly argv {
0 silly argv   _: [ 'run' ],
0 silly argv   parallel: true,
0 silly argv   lernaVersion: '4.0.0',
0 silly argv   '$0': '/Users/justasbartka/planning-chess/node_modules/.bin/lerna',
0 silly argv   script: 'dev'
0 silly argv }
1 notice cli v4.0.0
2 verbose rootPath /Users/justasbartka/planning-chess
3 error JSONError: Unexpected token "<" (0x3C) in JSON at position 1017 while parsing near "...xpress\": \"^4.17.1\",\n<<<<<<< HEAD\n    \"jo..." in services/api/package.json
3 error
3 error   25 |     "dotenv": "^8.2.0",
3 error   26 |     "express": "^4.17.1",
3 error > 27 | <<<<<<< HEAD
3 error      | ^
3 error   28 |     "joi": "^17.5.0"
3 error   29 | =======
3 error   30 |     "express-ws": "^5.0.2",
3 error
3 error     at parseJson (/Users/justasbartka/planning-chess/node_modules/parse-json/index.js:29:21)
3 error     at parse (/Users/justasbartka/planning-chess/node_modules/load-json-file/index.js:15:9)
3 error     at module.exports (/Users/justasbartka/planning-chess/node_modules/load-json-file/index.js:18:47)