Resolve merge conflict

Author: juhangil

src/AzureOpenAIProxy.PlaygroundApp/Components/Pages/Playground.razor

@@ -12,7 +12,7 @@
         </FluentGridItem>
 
         <FluentGridItem Class="chat-grid" xs="12" sm="12" md="8" lg="8" xl="8" xxl="8"
-                        Style="height: 800px;border:1px solid lightgrey">
+                        Style="border:1px solid lightgrey">
             <ChatWindowComponent Id="chat-window" @rendermode="InteractiveServer" />
         </FluentGridItem>
     </FluentGrid>

src/AzureOpenAIProxy.PlaygroundApp/Components/UI/ConfigTabComponent.razor

@@ -4,7 +4,7 @@
             <SystemMessageTabComponent Id="system-message-tab-component" OnSystemMessageChanged="SetSystemMessage" />
         </FluentTab>
         <FluentTab Id="parameters-tab" Label="Parameters">
-            This is "Parameters" tab.
+            <ParametersTabComponent />
         </FluentTab>
     </FluentTabs>
 </FluentStack>