Remove node_modules from repo and update instructions
Resolve merge conflict in README.md