update background styling
merge conflict update