diff --git a/src/ezbot_descr_simul/description/robot_core.xacro b/src/ezbot_descr_simul/description/robot_core.xacro
index 426dc76..1393ae8 100644
--- a/src/ezbot_descr_simul/description/robot_core.xacro
+++ b/src/ezbot_descr_simul/description/robot_core.xacro
@@ -247,10 +247,6 @@
 
     <gazebo reference="roue_gauche">
         <material>Gazebo/Blue</material>
-<<<<<<< HEAD
-=======
-        <!--Have friction only along the way it rotates-->
->>>>>>> 373c306d8c1b4496723604ba9328db8834d41ac4
         <fdir1>1 0 0</fdir1>
         <mu1>1.0</mu1>
         <mu2>0.1</mu2>
@@ -324,4 +320,4 @@
         <mu2>0.1</mu2>
     </gazebo>
 
-</robot>
\ No newline at end of file
+</robot>