merge controller into _app.js