add back changes
add node modules
fixed merge conflict in controllers
conclude merge