conflict on app.js