Clean merge conflict package.json & remove package.json.orig and npm-debug.log