diff --git a/本机环境/开发环境.md b/本机环境/开发环境.md
index 6c99c7c..e853ea7 100644
--- a/本机环境/开发环境.md
+++ b/本机环境/开发环境.md
@@ -174,7 +174,6 @@ cd E:\code\opensource\dify\docker
 docker compose up -d
 ```
 
-<<<<<<< .merge_file_PtWIJM
 + seatunel 集群
 集群搭建 G:\docker\compose\seatunnel
 ```shell
@@ -201,4 +200,3 @@ cd /opt/homebrew/Cellar/apache-flink/1.20.1/libexec/bin && ./start-cluster.sh
 ```
 web UI
 http://localhost:8081/#/overview
->>>>>>> .merge_file_9EbkBP