fix merging
fixing app.js