merge application.css changes