fixed an error
removed body background color
fixed merge conflict