Fixed merge issue in app.js