Add chat support
Resolve merge conflict