Merge do app.js