diff --git a/moveit_planners/moveit_planners/package.xml b/moveit_planners/moveit_planners/package.xml
index 0be9975a9c..6393a3d7a7 100644
--- a/moveit_planners/moveit_planners/package.xml
+++ b/moveit_planners/moveit_planners/package.xml
@@ -19,10 +19,14 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
 
+<<<<<<< HEAD
   <!--
   <exec_depend>chomp_motion_planner</exec_depend>
   <exec_depend>moveit_planners_chomp</exec_depend>
   -->
+=======
+  <exec_depend>moveit_planners_chomp</exec_depend>
+>>>>>>> 9e0b4dd7a (fix chomp inclued, closes #3228 (#3229))
   <exec_depend>moveit_planners_ompl</exec_depend>
   <exec_depend>pilz_industrial_motion_planner</exec_depend>