fixed js conflicts
Merged conflicts in application.js