merge working enc-chat