- Update app.js: routes, passport and merge conflicts