diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index bbe956d..d279c82 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -55,6 +55,7 @@ public class RobotContainer {
   
 CommandXboxController manette1 = new CommandXboxController(0);
 CommandXboxController manette2 = new CommandXboxController(1);
+<<<<<<< HEAD
 
 // dashboard
 SendableChooser<String> chooser = new SendableChooser<>();
@@ -62,6 +63,8 @@ String enhaut = "en haut";
 String aumilieux = "au milieux";
 String enbas = "en bas";
 String nulpart = "nul part";
+=======
+>>>>>>> 18e7c292ce3d2882eb58ef622b7e497d43d99fea
 ShuffleboardLayout layoutauto = Shuffleboard.getTab("teb").getLayout("auto",BuiltInLayouts.kList)
 .withSize(2, 2).withProperties(Map.of("Label position","LEFT"));
 GenericEntry autobalance = layoutauto.add("choix balance",true).withWidget(BuiltInWidgets.kToggleSwitch).getEntry();
@@ -102,6 +105,12 @@ Tape tape = new Tape(limelight, basePilotable, null);
 PivotManuel pivotManuel = new PivotManuel(pivot,manette2::getLeftX);
 BrasManuel brasManuel = new BrasManuel(brasTelescopique,manette2::getLeftY);
 
+
+SendableChooser<String> chooser = new SendableChooser<>();
+String enhaut = "en bas";
+String aumilieux = "au milieux";
+String enbas = "en bas";
+String nulpart = "nul part";
 public RobotContainer() {
     chooser.addOption(enhaut, enhaut);
     chooser.addOption(enbas, enbas);