diff --git a/frontend/dist/index.html b/frontend/dist/index.html
index eef6913..74c598c 100644
--- a/frontend/dist/index.html
+++ b/frontend/dist/index.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
@@ -35,4 +36,49 @@
+=======
+
+
+
+
+
+
+
+
+ Travel Planner
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> 9fae6afaac44c4d9f8def031bb048d3cb856a743
\ No newline at end of file
diff --git a/frontend/src/pages/MemberDashboard.tsx b/frontend/src/pages/MemberDashboard.tsx
index 9fc732d..8a7faab 100644
--- a/frontend/src/pages/MemberDashboard.tsx
+++ b/frontend/src/pages/MemberDashboard.tsx
@@ -538,12 +538,6 @@ export const MemberDashboard: React.FC = ({
useEffect(() => {
if (!user?.id) return;
-<<<<<<< Updated upstream
- const handleMessageReceived = (e: Event) => {
- const message = (e as CustomEvent).detail;
- // If we are actively chatting with the sender of this message
- if (activeChatUser && (message.senderId === activeChatUser.id || message.receiverId === activeChatUser.id)) {
-=======
// Connect to WebSocket: absolute URL on native, relative (Vite proxy) on web
const socket = Capacitor.isNativePlatform()
? io(BACKEND_URL)
@@ -559,7 +553,6 @@ export const MemberDashboard: React.FC = ({
// Check against window-global activeChatUserId so stale closure doesn't block updates
const activeChatUserId = (window as any).activeChatUserId;
if (activeChatUserId && (message.senderId === activeChatUserId || message.receiverId === activeChatUserId)) {
->>>>>>> Stashed changes
setChatMessages(prev => [...prev, message]);
} else {
// Add to unread states