indentation changed in app.js
Marge conflict removed