diff --git a/README.md b/README.md
index 665a3b3..6ae2ae1 100644
--- a/README.md
+++ b/README.md
@@ -15,17 +15,12 @@
 
 #### 使用说明
 
-<<<<<<< Updated upstream
+
 在最外层目录 catkin_make
-可能需要 source ./devel/setup.bash
-1.  roslaunch librviz_tutorial laser.launch 
-2.  xxxx
-=======
 在工作目录下(src上一层)
 记得source(可能需要)
 1.  source ./devel/setup.bash
 2.  roslaunch point_visual laser.launch
->>>>>>> Stashed changes
 3.  xxxx
 
 #### 参与贡献