fix pick_and_place_with_moveit_task_constructor.rst merge (#874)

Signed-off-by: Paul Gesel <[email protected]>

doc/tutorials/pick_and_place_with_moveit_task_constructor/pick_and_place_with_moveit_task_constructor.rst

@@ -773,17 +773,15 @@ We also create a serial container for the place stages. This is done similarly t
         place->properties().configureInitFrom(mtc::Stage::PARENT,
                                               { "eef", "group", "ik_frame" });
 
-<<<<<<< HEAD
-This next stage generates the poses used to place the object and compute the inverse kinematics for those poses - it is somewhat similar to the ``generate grasp pose`` stage from the pick serial container. We start by creating a stage to generate the poses and inheriting the task properties. We specify the pose where we want to place the object with a ``PoseStamped`` message from ``geometry_msgs`` - in this case, we choose ``y = 0.5``. We then pass the target pose to the stage with ``setPose``.  Next, we use ``setMonitoredStage`` and pass it the pointer to the ``attach object stage`` from earlier. This allows the stage to know how the object is attached. We then create a ``ComputeIK`` stage and pass it our ``GeneratePlacePose`` stage - the rest follows the same logic as above with the pick stages.
-=======
+
 This next stage generates the poses used to place the object and compute the inverse kinematics for those poses - it is somewhat similar to the ``generate grasp pose`` stage from the pick serial container.
 We start by creating a stage to generate the poses and inheriting the task properties.
 We specify the pose where we want to place the object with a ``PoseStamped`` message from ``geometry_msgs`` - in this case, we choose ``y = 0.5`` in the ``"object"`` frame.
 We then pass the target pose to the stage with ``setPose``.
 Next, we use ``setMonitoredStage`` and pass it the pointer to the ``attach_object`` stage from earlier.
 This allows the stage to know how the object is attached.
 We then create a ``ComputeIK`` stage and pass it our ``GeneratePlacePose`` stage - the rest follows the same logic as above with the pick stages.
->>>>>>> 35048cb (Fix place pose generation IK frame in MTC Tutorial (#727))
+
 
 .. code-block:: c++