style
renamed application.css
conflict resolution