app.js merge issue