diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 0315ac8..017cf52 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -9,17 +9,11 @@ import edu.wpi.first.wpilibj.XboxController;
 import edu.wpi.first.wpilibj2.command.Command;
 import edu.wpi.first.wpilibj2.command.Commands;
 import edu.wpi.first.wpilibj2.command.RunCommand;
-<<<<<<< HEAD
 import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
 import edu.wpi.first.wpilibj2.command.button.JoystickButton;
 import edu.wpi.first.wpilibj2.command.button.Trigger;
-=======
-<<<<<<< HEAD
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
-=======
 import edu.wpi.first.wpilibj2.command.button.JoystickButton;
->>>>>>> ded3f6018fe8a2c8b719139889c406330ff44003
->>>>>>> f1d0e3b3526aaeeafab0416ba8e92344786ea73c
 //subsystems
 import frc.robot.subsystems.BasePilotable;
 import frc.robot.subsystems.Gratte;
@@ -66,15 +60,14 @@ PivoteBrasHaut pivoteBrasHaut = new PivoteBrasHaut(brasTelescopique, pivot);
 public RobotContainer() {
     configureBindings();
 
-    basePilotable.setDefaultCommand(brakeOuvre);
-    basePilotable.drive(-manette1.getLeftY(), manette1.getLeftX(), -manette1.getLeftTriggerAxis()+manette1.getRightTriggerAxis());
+    basePilotable.setDefaultCommand(new RunCommand(() -> {
+      basePilotable.drive(-manette1.getLeftY(), manette1.getLeftX());
+    },basePilotable));
+    
 }
 
-
   private void configureBindings() {
-    XboxController exampleController = new XboxController(2);
-  Trigger aButton = new JoystickButton(exampleController, XboxController.Button.kY.value);
-
+