Resolve merge conflict in Gradio_UI.py

Gradio_UI.py

@@ -297,11 +297,12 @@ How can I assist you today?"""
         )
 
         with gr.Blocks(fill_height=True) as demo:
-            stored_messages = gr.State([])
+            stored_messages = gr.State([
+                gr.ChatMessage(role="assistant", content=welcome_message)
+            ])
             file_uploads_log = gr.State([])
             chatbot = gr.Chatbot(
                 label="Agent",
-                value=[[None, self.welcome_message]],  # Set initial message
                 type="messages",
                 avatar_images=(
                     None,
@@ -309,7 +310,7 @@ How can I assist you today?"""
                 ),
                 resizeable=True,
                 scale=1,
-                value=[[None, welcome_message]]  # Initialize with welcome message
+                value=[[None, welcome_message]]
             )
             # If an upload folder is provided, enable the upload feature
             if self.file_upload_folder is not None: