changed background color to grey
resolved merge conflict