fix: resolve conflicts in package.json

I hope this was done correctly.

It upgraded a few packages, we left out the electron packages and it added two
resolutions.