added application.js files
fixed merge conflict