app.js
resolve conflict