Conversation chat merge with master