Update app.js

fixed typo and spacing
corrected confilct
merge