added background image
merge conflict