Improving chat
Fixed conflict