application.css
footer display
merge conflict css