diff --git a/src/blackbox/blackbox_factory.py b/src/blackbox/blackbox_factory.py
index bcd7e9f..487815c 100644
--- a/src/blackbox/blackbox_factory.py
+++ b/src/blackbox/blackbox_factory.py
@@ -21,11 +21,8 @@ class BlackboxFactor:
         self.audio_to_text = AudioToText()
         self.text_to_audio = TextToAudio()
         self.tesou = Tesou()
-<<<<<<< HEAD
         self.fastchat = Fastchat()
-=======
         self.audio_chat = AudioChat(self.asr, self.tesou, self.tts)
->>>>>>> refs/remotes/origin/main
 
     def __call__(self, *args, **kwargs):
         return self.processing(*args, **kwargs)
@@ -47,11 +44,8 @@ class BlackboxFactor:
             return self.sum
         if blackbox_name == "tesou":
             return self.tesou
-<<<<<<< HEAD
         if blackbox_name == "fastchat":
             return self.fastchat
-=======
         if blackbox_name == "audio_chat":
             return self.audio_chat
->>>>>>> refs/remotes/origin/main
         raise ValueError("Invalid blockbox type")
\ No newline at end of file
diff --git a/src/blackbox/fastchat.py b/src/blackbox/fastchat.py
index 5432145..8e97a64 100755
--- a/src/blackbox/fastchat.py
+++ b/src/blackbox/fastchat.py
@@ -27,8 +27,8 @@ class Fastchat(Blackbox):
         #         "content": "你吃饭了吗"
         #     },
         #     {
-        #         'role': 'assistant', 
-        #         'content': '作为一个AI模型，我没有吃饭的需要，因为我并不具备实体形态。我专注于提供信息和帮助回答你的问题。你有什么需要帮助的吗？'
+        #         "role": "assistant", 
+        #         "content": "作为一个AI模型，我没有吃饭的需要，因为我并不具备实体形态。我专注于提供信息和帮助回答你的问题。你有什么需要帮助的吗？"
         #     },
         # ]
         history = []