Sorry to hear that, it sounds like you will need to restore your forum from backup
Someone might owe donuts.. :)
npm ERR! Failed to parse json
npm ERR! Unexpected token '<' at 2:1
npm ERR! <<<<<<< HEAD
npm ERR! ^
This is on a clean install?
It was an updated pull from a clean install. I don't do any nodebb hacking - just plugins.
Let me pull a fresh clean