deal conflict in app.js