Fixed conflict in application.js