Update app.js

just removing merge conflicts