git merge driver for resolving conflicts in npm-related files - View it on GitHub