cleared merge conflict in application.js