adjust css for background image
add image path to scss file
fix merge conflict