Fix doc of load_controller (#1132)

(cherry picked from commit 19c8ff8)

# Conflicts:
#	ros2controlcli/doc/userdoc.rst

ros2controlcli/doc/userdoc.rst

@@ -148,7 +148,7 @@ load_controller
 .. code-block:: console
 
     $ ros2 control load_controller -h
-    usage: ros2 control load_controller [-h] [--spin-time SPIN_TIME] [--set_state {configure,activate}] [-c CONTROLLER_MANAGER] [--include-hidden-nodes] controller_name
+    usage: ros2 control load_controller [-h] [--spin-time SPIN_TIME] [--set-state {inactive,active}] [-c CONTROLLER_MANAGER] [--include-hidden-nodes] controller_name
 
     Load a controller in a controller manager
 
@@ -159,7 +159,11 @@ load_controller
       -h, --help            show this help message and exit
       --spin-time SPIN_TIME
                             Spin time in seconds to wait for discovery (only applies when not using an already running daemon)
+<<<<<<< HEAD
       --set_state {configured,inactive,active}
+=======
+      --set-state {inactive,active}
+>>>>>>> 19c8ff8 (Fix doc of load_controller (#1132))
                             Set the state of the loaded controller
       -c CONTROLLER_MANAGER, --controller-manager CONTROLLER_MANAGER
                             Name of the controller manager ROS node