adding npm-debug to the gitignore
fix merge conflict