UNSOLVED package.json conflict

[Redicaljk]

I have this error after rebooting my Raspberry Pi:
pi@rpi4:~/MagicMirror $ npm run start
npm ERR! code EJSONPARSE
npm ERR! path /home/pi/MagicMirror/package.json
npm ERR! Merge conflict detected in your package.json.
npm ERR!
npm ERR! Please resolve the package.json conflict and retry.

npm ERR! A complete log of this run can be found in:

How do I determine what the conflict is?

[sdetweil]

@Redicaljk edit the file. there should be sections marked <<<<<<<<<<<
…
…

…
…

which notes the outgoing (someone made them locally) and incoming (coming from an update) changes

[Redicaljk]

@sdetweil thank you,

	"optionalDependencies": {
<<<<<<< Updated upstream
		"electron": "^19.1.0"
=======
		"electron": "^21.0.1"
>>>>>>> Stashed changes

How should I edit this?

[sdetweil]

@Redicaljk which one is running?

do

grep version node_modules/electron

delete the section that doesn’t match
and remove the extra <<< or >>> rows
and the row of ====