added application.js
update layout merge fix