small change bg
fixed merge