Remove the conflict for the app.js