background image tweak
fix merge conflict