merged app.js