fix application.less merge