Resolve merge conflicts

app/Http/Controllers/user/ChatController.php

@@ -67,6 +67,12 @@ class ChatController extends Controller
             'sender_id'   => auth()->id(),
             'sender_type' => \App\Models\User::class,
             'message'     => $request->message,
+<<<<<<< HEAD
+=======
+             'client_id'   => $request->client_id, // ✅ ADD
+            'read_by_admin' => false,
+            'read_by_user'  => true,
+>>>>>>> 8b6d3d5fadadda310ef45ec03c879b900bff4cb025f45d1bb5d188761d53e043
         ];
 
         // Handle file upload
@@ -83,7 +89,11 @@ class ChatController extends Controller
         $message->load('sender');
 
         // Fire real-time event
+<<<<<<< HEAD
         broadcast(new NewChatMessage($message))->toOthers();
+=======
+        broadcast(new NewChatMessage($message));
+>>>>>>> 8b6d3d5fadadda310ef45ec03c879b900bff4cb025f45d1bb5d188761d53e043
 
         return response()->json([
             'success' => true,