changed application.css
resolve conflicts