fixed conflicts at app.js