fixing app.js
Fixing merge conflict