Fixed conflicts
ignore npm-debug.log