[grahamedgecombe]

It's probably easier to manually merge the manifest (as they're much more human-readable) than a lock file though.

[steveklabnik]

Lock files are easy enough to resolve that npm, in newer versions, will do it for you automatically, if you ask it to.