diff --git a/pcl_ros/pcl_nodelets.xml b/pcl_ros/pcl_nodelets.xml
index 8fbe4a68..cece6f06 100644
--- a/pcl_ros/pcl_nodelets.xml
+++ b/pcl_ros/pcl_nodelets.xml
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-=======
-
 <!-- PCL Features library component -->
 <library path="lib/libpcl_ros_features">
   <class name="pcl/BoundaryEstimation" type="BoundaryEstimation" base_class_type="nodelet::Nodelet">
@@ -36,8 +33,6 @@
       in parallel, using the OpenMP standard.
     </description>
   </class>
->>>>>>> c3c0d30... Merge pull request #60 from martimorta/hydro-devel
-
 
 <!-- PCL IO library component -->
 <library path="lib/libpcl_ros_io">