Merge text_editor_emoticons