changed application.js order
fix merge