app.js
fix app.js conflict