diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index cd32dfe..f41be62 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -110,30 +110,11 @@ public class RobotContainer {
       ,grimpeur));
 
       LED.setDefaultCommand(allumeLED);
-      */
+      
       dashboard.add("autochooser",autoChooser)
       .withSize(2,1)
       .withPosition(1,1);
-<<<<<<< HEAD
      
-=======
-      manette
-        .a()
-        .and(manette.rightBumper())
-        .whileTrue(lanceur.sysIdQuasistatic(SysIdRoutine.Direction.kForward));
-    manette
-        .b()
-        .and(manette.rightBumper())
-        .whileTrue(lanceur.sysIdQuasistatic(SysIdRoutine.Direction.kReverse));
-    manette
-        .x()
-        .and(manette.rightBumper())
-        .whileTrue(lanceur.sysIdDynamic(SysIdRoutine.Direction.kForward));
-    manette
-        .y()
-        .and(manette.rightBumper())
-        .whileTrue(lanceur.sysIdDynamic(SysIdRoutine.Direction.kReverse));
->>>>>>> c93da60343b8810f6391280759f99f9dcc7ff690
 
   }