[reconbot]

If you run `npm install` again it does detect the conflict and resolve it. https://docs.npmjs.com/files/package-locks#resolving-lockfil... But in practice I haven't found any changes that have been untenable to understand with a diff.

[dickeytk]

resolving conflicts isn't why I read the diff (yarn resolves automatically anyways) it's so I can see what has changed