resolve conflict in app/assets/stylesheets/application.css.less