Merge app.js