chat
chatting
fix merge
fixes