diff --git a/components/common/ChatInputBox.tsx b/components/common/ChatInputBox.tsx
index 60b574e..bc9c9db 100644
--- a/components/common/ChatInputBox.tsx
+++ b/components/common/ChatInputBox.tsx
@@ -30,15 +30,11 @@ import { AudioRecorder } from "./AudioRecorder";
 import { useTemplateStoryServiceHook } from "@/app/service/Interaction/templateStoryService";
 import { createScriptEpisodeNew } from "@/api/script_episode";
 import { useRouter } from "next/navigation";
-<<<<<<< HEAD
 import { EditorContent, useEditor } from "@tiptap/react";
 import StarterKit from "@tiptap/starter-kit";
 import { HighlightTextExtension } from "@/components/ui/main-editor/HighlightText";
 import Placeholder from "@tiptap/extension-placeholder";
 import { createMovieProjectV1 } from "@/api/video_flow";
-=======
-import { createMovieProjectV1 } from "@/api/video_flow";
->>>>>>> 3a713f988f2a1b9f322258e14c192470d879eee5
 
 // 自定义音频播放器样式
 const customAudioPlayerStyles = `