diff --git a/knowledge_hub/激光雷达目标检测算法部署流程.md b/knowledge_hub/激光雷达目标检测算法部署流程.md
index 1806676..1a27083 100644
--- a/knowledge_hub/激光雷达目标检测算法部署流程.md
+++ b/knowledge_hub/激光雷达目标检测算法部署流程.md
@@ -39,10 +39,6 @@ ros2 launch websocket websocket_service.launch.py
 5. 启动launch文件
 ros2 launch hobot_centerpoint hobot_centerpoint_websocket.launch.py lidar_pre_path:=config/hobot_centerpoint_data
 
-<<<<<<< Updated upstream
-5. 测试效果 
-=======
 6. 测试效果 
->>>>>>> Stashed changes
 运行成功后在pc端游览器输入：[http://IP:8000](http://ip:8000/)，即可查看图像和算法渲染效果（IP为RDK的IP地址）