Fixing app.js oversight on merge conflict