diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index de3edd1..96cd9b4 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -94,16 +94,7 @@ public RobotContainer() {
     manette1.x().toggleOnTrue(Commands.startEnd(basePilotable::BrakeFerme,basePilotable::BrakeOuvre,basePilotable));
     manette1.y().whileTrue(gyro);
     manette1.start().toggleOnTrue(Commands.startEnd(basePilotable::resetGyro, basePilotable::resetGyro, basePilotable));
-    /*manette1.b().toggleOnTrue(Commands.startEnd(gratte::baiser, gratte::Lever,gratte));
-    manette2.a().toggleOnTrue(Commands.startEnd(brasTelescopique::pivoteBrasHaut, brasTelescopique::pivoteBrasHaut));
-    manette2.b().toggleOnTrue(Commands.startEnd(brasTelescopique::pivoteBrasBas, brasTelescopique::pivoteBrasBas, brasTelescopique));
-    manette2.x().toggleOnTrue(Commands.startEnd(brasTelescopique::pivoteBrasMilieux, brasTelescopique::pivoteBrasMilieux, brasTelescopique));
-    manette2.y().toggleOnTrue(Commands.startEnd(brasTelescopique::pivotBrasRentre, brasTelescopique::pivotBrasRentre, brasTelescopique));
-    manette2.povRight().toggleOnTrue(Commands.startEnd(brasTelescopique::PivotChercheBas, brasTelescopique::PivotChercheBas, brasTelescopique));
-    manette2.povLeft().toggleOnTrue(Commands.startEnd(brasTelescopique::PivotChercheHaut, brasTelescopique::PivotChercheHaut, brasTelescopique));
-    manette2.rightBumper().toggleOnTrue(Commands.startEnd(null, null, null));
-    manette2.leftBumper().toggleOnTrue(Commands.startEnd(null, null, null));**/
-    manette2.leftBumper().toggleOnTrue(Commands.startEnd(null, null, null));
+    
     
   }
 
diff --git a/src/main/java/frc/robot/subsystems/Gratte.java b/src/main/java/frc/robot/subsystems/Gratte.java
index 877a104..8b0a9a2 100644
--- a/src/main/java/frc/robot/subsystems/Gratte.java
+++ b/src/main/java/frc/robot/subsystems/Gratte.java
@@ -13,10 +13,7 @@ import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
 import frc.robot.Constants;
 
 public class Gratte extends SubsystemBase {
-<<<<<<< HEAD
 
-=======
->>>>>>> aabe9b40ae896a36acdc9cd17a508016a3660a0a
 ShuffleboardTab teb = Shuffleboard.getTab("teb"); 
 ShuffleboardLayout limitswitchgratte = Shuffleboard.getTab("teb")
 .getLayout("limitswitchsgratte", BuiltInLayouts.kList)
diff --git a/src/main/java/frc/robot/subsystems/bras/Pivot.java b/src/main/java/frc/robot/subsystems/bras/Pivot.java
index 0fe6788..082ce2b 100644
--- a/src/main/java/frc/robot/subsystems/bras/Pivot.java
+++ b/src/main/java/frc/robot/subsystems/bras/Pivot.java
@@ -14,10 +14,7 @@ import com.revrobotics.CANSparkMax;
 import com.revrobotics.CANSparkMaxLowLevel.MotorType;
 
 public class Pivot extends SubsystemBase {
-<<<<<<< HEAD
 
-=======
->>>>>>> aabe9b40ae896a36acdc9cd17a508016a3660a0a
  ShuffleboardTab teb = Shuffleboard.getTab("teb");
   
   // moteur