css of chat
fixing merge