Commit

1a28226

the package-lock.json merge conflict is just two package managers arguing over who gets to be wrong about a transitive dependency, and you get to referee it by deleting the file and running npm install again

commit 1a28226