Fix non-ff merge issue with package.json and lock file

[TomAdam]

A non-fast-forward merge has resulted in some dependencies removed in an earlier merge getting reinstated. This removes them again.