i guess we don't need .npmignore
ranting about how it works
resolve merge conflicts