chat styling
merge conflict resolved