Updated app.js with merges