diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
index c6ffe06..3b88ae7 100644
--- a/src/main/java/frc/robot/Constants.java
+++ b/src/main/java/frc/robot/Constants.java
@@ -5,15 +5,6 @@ public class Constants {
     public static int avantgauche = 1;
     public static int arrieredroit = 2;
     public static int arrieregauche = 3;
-<<<<<<< HEAD
     public static int BrasTelescopique = 5;
-
-
-
-
-
-
-=======
     public static int actuateur = 4;
->>>>>>> 91d5a71d52bad9fc56b40c68d78207113e16cd21
 }