Fixed conflict in app.js