fixed merge conflict in app.js