diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
index 367a050..dc12c60 100644
--- a/src/main/java/frc/robot/Constants.java
+++ b/src/main/java/frc/robot/Constants.java
@@ -5,13 +5,10 @@ public class Constants {
     public static int avantgauche = 1;
     public static int arrieredroit = 2;
     public static int arrieregauche = 3;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
+
     public static int leverGratte = 0;
     public static int baisserGratte = 1;
->>>>>>> Gratte
+
     // pneumatique
     public static int pistonpinceouvre = 0;
     public static int pistonpinceferme = 1;
@@ -22,28 +19,23 @@ public class Constants {
     public static int limithg = 1;
     
 
-=======
-<<<<<<< HEAD
+
     public static int BrasTelescopique = 5;
->>>>>>> a6d29dff41c9186a3dd56354d6416a625159f366
 
 
 
 
 
-<<<<<<< HEAD
 
-=======
+
+
     public static int actuateur = 4;
->>>>>>> 91d5a71d52bad9fc56b40c68d78207113e16cd21
-=======
+
     public static int actuateur = 4;
->>>>>>> Gratte
-=======
     // pneumatique
     public static int pistonpinceouvre = 0;
     public static int pistonpinceferme = 1;
     public static int BrasTelescopique = 5;
     public static int actuateur = 4;
->>>>>>> 48259c9fcef533cfc4c76020b5b7862858c0627b
+
 }
diff --git a/src/main/java/frc/robot/subsystems/Gratte.java b/src/main/java/frc/robot/subsystems/Gratte.java
index 6dd93cb..5a501c2 100644
--- a/src/main/java/frc/robot/subsystems/Gratte.java
+++ b/src/main/java/frc/robot/subsystems/Gratte.java
@@ -4,19 +4,15 @@
 
 package frc.robot.subsystems;
 
-<<<<<<< HEAD
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
 
-public class Gratte extends SubsystemBase {
-  /** Creates a new Gratte. */
-  public Gratte() {}
 
-=======
+
 import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX;
-import com.fasterxml.jackson.annotation.JacksonInject.Value;
+
 
 import edu.wpi.first.wpilibj.DigitalInput;
-import edu.wpi.first.wpilibj2.command.SubsystemBase;
+
 import frc.robot.Constants;
 
 public class Gratte extends SubsystemBase {
@@ -46,7 +42,6 @@ public class Gratte extends SubsystemBase {
     baisserGratte.set(vitesse);
     leverGratte.set(vitesse);
   }
->>>>>>> Gratte
   @Override
   public void periodic() {
     // This method will be called once per scheduler run