manual merge of chat