new background image
mergetool fixed conflicts in application.css