Nodejs config.js removed
merge conflict resolved