background updated
fixed merge