fix merge conflict in app.js