Update release_notes.rst

Author: christophfroehlich

doc/release_notes.rst

@@ -14,7 +14,6 @@ force_torque_sensor_broadcaster
 * Added support for filter chains, allowing users to configure a sequence of filter plugins with their parameters. The force/torque sensor readings are filtered sequentially and published on a separate topic.
 * Added support for transforming Wrench messages to a given list of target frames. This is useful when applications need force/torque data in their preferred coordinate frames. (`#2021 <https://github.com/ros-controls/ros2_controllers/pull/2021/files>`__).
 
-<<<<<<< HEAD
 imu_sensor_broadcaster
 *******************************
 * IMU sensor broadcaster is now a chainable controller. It supports a calibration by means of a rotation, defined as euler angles, to its target frame. (`#1833 <https://github.com/ros-controls/ros2_controllers/pull/1833/files>`__).
@@ -26,6 +25,10 @@ joint_trajectory_controller
   <https://github.com/ros-controls/ros2_controllers/pull/1191>`__. With this the controller
   "stretches the time" with which it progresses in the trajectory. Scaling can either be set
   manually or it can be synchronized with the hardware. See :ref:`jtc_speed_scaling` for details.
+* Fill in 0 velocities and accelerations into point before trajectories if the state interfaces
+  don't contain velocity / acceleration information, but the trajectory does. This way, the segment
+  up to the first waypoint will use the same interpolation as the rest of the trajectory. (`#2043
+  <https://github.com/ros-controls/ros2_controllers/pull/2043>`_)
 
 omni_wheel_drive_controller
 *********************************
@@ -42,11 +45,3 @@ pid_controller
 motion_primitives_forward_controller
 *******************************************
 * 🚀 The motion_primitives_forward_controller was added 🎉 (`#1636 <https://github.com/ros-controls/ros2_controllers/pull/1636>`_).
-=======
-joint_trajectory_controller
-***************************
-* Fill in 0 velocities and accelerations into point before trajectories if the state interfaces
-  don't contain velocity / acceleration information, but the trajectory does. This way, the segment
-  up to the first waypoint will use the same interpolation as the rest of the trajectory. (`#2043
-  <https://github.com/ros-controls/ros2_controllers/pull/2043>`_)
->>>>>>> 79f917e (Fill point_before_trajectory with same information as trajectory (#2043))