removed node_modules
renamed rrr to rr
merge conflicts