diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 9dc4fb5..0315ac8 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -10,10 +10,16 @@ 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;
@@ -61,14 +67,19 @@ public RobotContainer() {
     configureBindings();
 
     basePilotable.setDefaultCommand(brakeOuvre);
-    basePilotable.drive(-manette1.getLeftY(), manette1.getLeftX(), -manette1.getLeftTriggerAxis()+manette1.getRightTriggerAxis(), basePilotable);
+    basePilotable.drive(-manette1.getLeftY(), manette1.getLeftX(), -manette1.getLeftTriggerAxis()+manette1.getRightTriggerAxis());
 }
 
 
   private void configureBindings() {
+    XboxController exampleController = new XboxController(2);
+  Trigger aButton = new JoystickButton(exampleController, XboxController.Button.kY.value);
+
+
+
+
+
 
-    JoystickButton buttonA = new JoystickButton(manette1, XboxController.Button.kA.value);
-    buttonA.whenPressed()
   }
 
   public Command getAutonomousCommand() {