fixed a merge conflict in app.js