diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
index 777fea3..73fa1ef 100644
--- a/src/main/java/frc/robot/Constants.java
+++ b/src/main/java/frc/robot/Constants.java
@@ -5,18 +5,12 @@ public class Constants {
     public static int avantgauche = 1;
     public static int arrieredroit = 2;
     public static int arrieregauche = 3;
-<<<<<<< HEAD
     public static int BrasTelescopique = 4;
     public static int pivot = 5;
     
     //moteur
     public static int leverGratte = 0;
     public static int baisserGratte = 1;
-=======
-
-    public static int leverGratte = 7;
-    public static int baisserGratte = 6;
->>>>>>> Dash
 
     // pneumatique
     public static int pistonpinceouvre = 0;
diff --git a/src/main/java/frc/robot/subsystems/Gratte.java b/src/main/java/frc/robot/subsystems/Gratte.java
index e758b90..8707d45 100644
--- a/src/main/java/frc/robot/subsystems/Gratte.java
+++ b/src/main/java/frc/robot/subsystems/Gratte.java
@@ -7,25 +7,18 @@ package frc.robot.subsystems;
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
 import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX;
 import edu.wpi.first.wpilibj.DigitalInput;
-<<<<<<< HEAD
 import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
-=======
 import edu.wpi.first.wpilibj.shuffleboard.BuiltInLayouts;
 import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
 import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardLayout;
->>>>>>> Dash
 import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
 import frc.robot.Constants;
 
 public class Gratte extends SubsystemBase {
-<<<<<<< HEAD
-  ShuffleboardTab teb = Shuffleboard.getTab("teb");
-=======
-ShuffleboardTab teb = Shuffleboard.getTab("teb"); 
+ ShuffleboardTab teb = Shuffleboard.getTab("teb"); 
 ShuffleboardLayout limitswitchgratte = Shuffleboard.getTab("teb")
 .getLayout("limitswitchsgratte", BuiltInLayouts.kList)
 .withSize(2, 2);
->>>>>>> Dash
   private WPI_TalonSRX Gratted = new WPI_TalonSRX(Constants.leverGratte);  
   private WPI_TalonSRX Gratteg = new WPI_TalonSRX(Constants.baisserGratte);
   private DigitalInput limithd = new DigitalInput(Constants.limithd);
@@ -59,16 +52,13 @@ ShuffleboardLayout limitswitchgratte = Shuffleboard.getTab("teb")
   }
   @Override
   public void periodic() {
-<<<<<<< HEAD
     teb .add("limithd", 0.1);
     teb .add("limithg", 0.1);
     teb .add("limitbd", 0.1);
     teb .add("limitbg", 0.1);
-=======
     limitswitchgratte.add ("limitbd", 0.1);
     limitswitchgratte.add ("limithg", 0.1);
     limitswitchgratte.add ("limithd", 0.1);
     limitswitchgratte.add ("limitbg", 0.1);
->>>>>>> Dash
   }
 }
diff --git a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java
index 815f1c0..8ddbd77 100644
--- a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java
+++ b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java
@@ -8,13 +8,10 @@ package frc.robot.subsystems.bras;
 import com.revrobotics.CANSparkMax;
 import com.revrobotics.CANSparkMaxLowLevel.MotorType;
 
-<<<<<<< HEAD
 import edu.wpi.first.wpilibj.DigitalInput;
 import edu.wpi.first.wpilibj.DoubleSolenoid;
 import edu.wpi.first.wpilibj.PneumaticsModuleType;
 import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
-=======
->>>>>>> Dash
 import edu.wpi.first.wpilibj.shuffleboard.BuiltInLayouts;
 import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
 import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardLayout;
@@ -23,18 +20,14 @@ import edu.wpi.first.wpilibj2.command.SubsystemBase;
 import frc.robot.Constants;
 
 public class BrasTelescopique extends SubsystemBase {
-<<<<<<< HEAD
   ShuffleboardTab teb = Shuffleboard.getTab("teb");
   ShuffleboardLayout layout = Shuffleboard.getTab("teb")
   .getLayout("layout", BuiltInLayouts.kList)
   .withSize(2, 2);
-=======
   
-ShuffleboardTab teb = Shuffleboard.getTab("teb"); 
 ShuffleboardLayout bras = Shuffleboard.getTab("teb")
 .getLayout("bras", BuiltInLayouts.kList)
 .withSize(2, 2);
->>>>>>> Dash
   /** Creates a new BrasTelescopique. */
   public BrasTelescopique() {}
   final CANSparkMax Winch = new CANSparkMax(Constants.BrasTelescopique,MotorType.kBrushless);
@@ -60,11 +53,8 @@ ShuffleboardLayout bras = Shuffleboard.getTab("teb")
     }
   @Override
   public void periodic() {
-<<<<<<< HEAD
     teb .add("photocell",0.1);
     teb .add("winch",0.1);
-=======
     bras.add ("encodeur",0.1);
->>>>>>> Dash
   }
 }
\ No newline at end of file
diff --git a/src/main/java/frc/robot/subsystems/bras/Pivot.java b/src/main/java/frc/robot/subsystems/bras/Pivot.java
index a1ef017..ad36e3a 100644
--- a/src/main/java/frc/robot/subsystems/bras/Pivot.java
+++ b/src/main/java/frc/robot/subsystems/bras/Pivot.java
@@ -14,11 +14,7 @@ import com.revrobotics.CANSparkMax;
 import com.revrobotics.CANSparkMaxLowLevel.MotorType;
 
 public class Pivot extends SubsystemBase {
-<<<<<<< HEAD
   ShuffleboardTab teb = Shuffleboard.getTab("teb");
-=======
-ShuffleboardTab teb = Shuffleboard.getTab("teb"); 
->>>>>>> Dash
   // moteur
   private CANSparkMax pivot = new CANSparkMax(Constants.pivot,MotorType.kBrushless);
   private DigitalInput limitpivot = new DigitalInput(Constants.limitpivot);
@@ -40,12 +36,9 @@ ShuffleboardTab teb = Shuffleboard.getTab("teb");
   }
   @Override
   public void periodic() {
-<<<<<<< HEAD
     teb .add("encodeur", 0.1);
   }
-}
-=======
-  teb .add ("encodeur pivot",0.1);
+  {
+  teb.add ("encodeur pivot",0.1);
  }
 }
->>>>>>> Dash