resolved merge conflic, app.js -> routes.js, app.js now kick off logic