From d30a4f2ed4ec6efab6702e43575ffaa19d78fc96 Mon Sep 17 00:00:00 2001
From: Jazz Turner-Baggs <473256+jazzz@users.noreply.github.com>
Date: Thu, 18 Jun 2026 17:44:14 -0700
Subject: [PATCH] Update DirectV1 to support multiple members

---
 core/conversations/src/conversation/direct_v1.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/conversations/src/conversation/direct_v1.rs b/core/conversations/src/conversation/direct_v1.rs
index f75bdb0..e40c36c 100644
--- a/core/conversations/src/conversation/direct_v1.rs
+++ b/core/conversations/src/conversation/direct_v1.rs
@@ -21,6 +21,10 @@ impl DirectV1Convo {
     // have multiple Installations.
     pub fn new<S: ExternalServices>(
         cx: &mut ServiceContext<S>,
+<<<<<<< HEAD
+=======
+        // Constructor must accept multiple
+>>>>>>> 206314b (Update DirectV1 to support multiple members)
         members: &[IdentIdRef],
     ) -> Result<Self, ChatError> {
         let mut inner_group = DelegateGroup::new(cx)?;