route edits in .js
fix conflicts
merge conflicts
update name fields in login form