diff --git a/include/iri_nav_hole_detection_alg.h b/include/iri_nav_hole_detection_alg.h
index 4649017b639d4166cc08f80b8ad9a874d490d8c1..9ef67472a8cf79d70c6582b32511055d4060f88b 100644
--- a/include/iri_nav_hole_detection_alg.h
+++ b/include/iri_nav_hole_detection_alg.h
@@ -132,22 +132,12 @@ class HoleDetectionAlgorithm
     *
     */
     ~HoleDetectionAlgorithm(void);
-<<<<<<< HEAD:include/hole_detection_alg.h
-    
-     void cloud_all(int hole_min_p, float box_y_end, float box_z_ini, 
-                    float box_x, float box_y_ini, float box_z_end, 
-                    float Xl, float Xc, float Xr, float Y, 
-                    pcl::PointCloud<pcl::PointXYZRGB>& cloud_in, 
-                    pcl::PointCloud<pcl::PointXYZ>::Ptr& cloud_out);    
-       
-=======
 
      void cloud_all(int hole_min_p, float box_z_end, float box_x_ini,
                     float box_y, float box_z_ini, float box_x_end, int num_cells, float Z,
                     pcl::PointCloud<pcl::PointXYZRGB>& cloud_in,
                     pcl::PointCloud<pcl::PointXYZ>::Ptr& cloud_out);
 
->>>>>>> axis_Z_to_axis_X_migration:include/iri_nav_hole_detection_alg.h
 };
 
 #endif