diff --git a/ShoppingAssistantWebClient.Web/Pages/Chat.razor b/ShoppingAssistantWebClient.Web/Pages/Chat.razor
index 9dbe618..605be65 100644
--- a/ShoppingAssistantWebClient.Web/Pages/Chat.razor
+++ b/ShoppingAssistantWebClient.Web/Pages/Chat.razor
@@ -86,8 +86,11 @@
 
         [Parameter] public string chatId { get; set; }
 
+<<<<<<< HEAD
 
         
+=======
+>>>>>>> 01de98d (Create chat frame and redirect to page chat. cart)
 }
 
 
diff --git a/ShoppingAssistantWebClient.Web/Shared/NavMenu.razor b/ShoppingAssistantWebClient.Web/Shared/NavMenu.razor
index d2e40f8..131b4e9 100644
--- a/ShoppingAssistantWebClient.Web/Shared/NavMenu.razor
+++ b/ShoppingAssistantWebClient.Web/Shared/NavMenu.razor
@@ -1,4 +1,4 @@
-
+
 @inject NavigationManager Navigation
 
 
@@ -117,4 +117,5 @@
          
     }
 
+
 }