all messages styling
fixed merge
all committed
merged conflicts