added background

added background
fixed merge errors