diff --git a/.env.development b/.env.development
index 4a60a63..5e8761f 100644
--- a/.env.development
+++ b/.env.development
@@ -1,17 +1,8 @@
 
-
-<<<<<<< Updated upstream
 NEXT_PUBLIC_JAVA_URL = https://77.app.java.auth.qikongjian.com
-# NEXT_PUBLIC_JAVA_URL = http://192.168.120.83:8080
 NEXT_PUBLIC_BASE_URL = https://77.smartvideo.py.qikongjian.com
 NEXT_PUBLIC_CUT_URL = https://smartcut.huiying.video
-=======
-# NEXT_PUBLIC_JAVA_URL = https://77.app.java.auth.qikongjian.com
-# NEXT_PUBLIC_BASE_URL = https://77.smartvideo.py.qikongjian.com
-# NEXT_PUBLIC_CUT_URL = https://smartcut.huiying.video
-NEXT_PUBLIC_JAVA_URL = https://auth.movieflow.ai
-NEXT_PUBLIC_BASE_URL = https://api.video.movieflow.ai 
-NEXT_PUBLIC_CUT_URL = https://smartcut.movieflow.ai
->>>>>>> Stashed changes
+NEXT_PUBLIC_CUTAPI_URL = http://77.smartcut.py.qikongjian.com
+
 # 失败率
 NEXT_PUBLIC_ERROR_CONFIG = 0.1
\ No newline at end of file
diff --git a/components/pages/work-flow.tsx b/components/pages/work-flow.tsx
index 90a4bb1..319c9b3 100644
--- a/components/pages/work-flow.tsx
+++ b/components/pages/work-flow.tsx
@@ -14,7 +14,7 @@ import { SaveEditUseCase } from "@/app/service/usecase/SaveEditUseCase";
 import { useSearchParams } from "next/navigation";
 import SmartChatBox from "@/components/SmartChatBox/SmartChatBox";
 import { Drawer, Tooltip, notification } from 'antd';
-// import { showEditingNotification } from "@/components/pages/work-flow/editing-notification";
+import { showEditingNotification } from "@/components/pages/work-flow/editing-notification";
 // import { AIEditingIframeButton } from './work-flow/ai-editing-iframe';
 import { exportVideoWithRetry } from '@/utils/export-service';
 
@@ -127,8 +127,6 @@ const WorkFlow = React.memo(function WorkFlow() {
     setTimeout(() => {
       handleTestExportRef.current?.();
     }, 0);
-    // 编辑通知已全部注释
-    /*
     editingNotificationKey.current = `editing-${Date.now()}`;
     showEditingNotification({
       description: 'Performing intelligent editing...',
@@ -176,7 +174,6 @@ const WorkFlow = React.memo(function WorkFlow() {
         }, 200);
       }
     });
-    */
   }, [episodeId]); // handleTestExport 在内部调用，无需作为依赖
 
   /** 处理导出失败 */
@@ -226,8 +223,7 @@ const WorkFlow = React.memo(function WorkFlow() {
     console.log('changedIndex_work-flow', currentSketchIndex, taskObject);
   }, [currentSketchIndex, taskObject]);
 
-  // 监听粗剪是否完成 - 已注释，不显示右上角成功通知
-  /*
+  // 监听粗剪是否完成
   useEffect(() => {
     console.log('🎬 final video useEffect triggered:', { 
       finalUrl: taskObject.final.url, 
@@ -261,7 +257,6 @@ const WorkFlow = React.memo(function WorkFlow() {
       });
     }
   }, [taskObject.final, isHandleEdit, episodeId]);
-  */
 
   const handleEditModalOpen = useCallback((tab: string) => {
     setActiveEditTab(tab);