application.js merge mess up fixed