diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
index 1b12241..bda0c2e 100644
--- a/src/main/java/frc/robot/Constants.java
+++ b/src/main/java/frc/robot/Constants.java
@@ -5,25 +5,9 @@ public class Constants {
     public static int avantgauche = 1;
     public static int arrieredroit = 2;
     public static int arrieregauche = 3;
-<<<<<<< HEAD
-    public static int BrasTelescopique = 5;
-=======
-<<<<<<< HEAD
     // pneumatique
     public static int pistonpinceouvre = 0;
     public static int pistonpinceferme = 1;
-
-=======
-<<<<<<< HEAD
     public static int BrasTelescopique = 5;
->>>>>>> a6d29dff41c9186a3dd56354d6416a625159f366
-
-
-
-
-
-
-=======
->>>>>>> 574a86d6fc0c2873af374a5d04dc6081c08a4c02
     public static int actuateur = 4;
 }