removing all the node_modules
fixing merge conflict
changes to packages stuff
adding Rhoan to the homepage