Fix controller dependencies (#837)

(cherry picked from commit 54addf2)

# Conflicts:
#	gz_ros2_control_demos/package.xml

Author: christophfroehlich

gz_ros2_control_demos/package.xml

@@ -49,15 +49,19 @@
   <depend>hardware_interface</depend>
   <exec_depend>ackermann_steering_controller</exec_depend>
   <exec_depend>diff_drive_controller</exec_depend>
-  <exec_depend>effort_controllers</exec_depend>
   <exec_depend>force_torque_sensor_broadcaster</exec_depend>
+  <exec_depend>forward_command_controller</exec_depend>
   <exec_depend>imu_sensor_broadcaster</exec_depend>
   <exec_depend>joint_state_broadcaster</exec_depend>
   <exec_depend>joint_trajectory_controller</exec_depend>
   <exec_depend>mecanum_drive_controller</exec_depend>
   <exec_depend>ros2controlcli</exec_depend>
+<<<<<<< HEAD
   <exec_depend>tricycle_controller</exec_depend>
   <exec_depend>velocity_controllers</exec_depend>
+=======
+  <exec_depend>tricycle_steering_controller</exec_depend>
+>>>>>>> 54addf2 (Fix controller dependencies (#837))
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>