added module dependencies
merge conflict in package.json