updated bg color
resolved conflict