diff --git a/README.md b/README.md
index 82c6696..741b160 100644
--- a/README.md
+++ b/README.md
@@ -106,21 +106,15 @@ Initilize rosdep:
 	copy (or add) files from px4_launch directory to '~/PX4-Autopilot/launch'
 ### MAVROS
 - in px4.launch, replace:
-<<<<<<< HEAD
 '''
 arg name="fcu_url" default="/dev/ttyACM0:57600" 
 arg name="gcs_url" default="udp-b://127.0.0.1:14555@14550"
 '''
-=======
-
-arg name="fcu_url" default="/dev/ttyACM0:57600" 
-arg name="gcs_url" default="udp-b://127.0.0.1:14555@14550"
-
->>>>>>> 82c7bd26a006f5ffb4d0f2a2a6dc623552984cef
 - with:
-
+'''
 	arg name="fcu_url" default="udp://:14551@192.168.1.91:14556"
 	arg name="gcs_url" default="udp-b://127.0.0.1:14555@14550" 
+'''
 
 #### CHANGE DEVEL/SETUP.BASH
 In catkin_ws (or any working directory) add to devel/setup.bash: