-<<<<<<< 1b45bc927675060d057730fc7c7083fb9d813f66
- * This command runs the winch motor continuously at a specified speed until the
- * button triggering it is released. This command also makes the drive train
- * motors run because the winch is controlled by the drive train.
-=======
- * This command will run the winch motor continuously until the button
- * triggering it is released. This command also runs the drive train.
->>>>>>> Delete StopWinch and Climber subsystem, edit javadoc comments
+ * <<<<<<< 1b45bc927675060d057730fc7c7083fb9d813f66 This command runs the winch
+ * motor continuously at a specified speed until the button triggering it is
+ * released. This command also makes the drive train motors run because the
+ * winch is controlled by the drive train. ======= This command will run the
+ * winch motor continuously until the button triggering it is released. This
+ * command also runs the drive train. >>>>>>> Delete StopWinch and Climber
+ * subsystem, edit javadoc comments