diff --git a/bin/main/frc/robot/Constants.class b/bin/main/frc/robot/Constants.class
index aba154f..e6d7920 100644
Binary files a/bin/main/frc/robot/Constants.class and b/bin/main/frc/robot/Constants.class differ
diff --git a/bin/main/frc/robot/commands/Gyro.class b/bin/main/frc/robot/commands/Gyro.class
index 48c1e8d..9bfcf27 100644
Binary files a/bin/main/frc/robot/commands/Gyro.class and b/bin/main/frc/robot/commands/Gyro.class differ
diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
index 44ac11c..427cfff 100644
--- a/src/main/java/frc/robot/Constants.java
+++ b/src/main/java/frc/robot/Constants.java
@@ -20,29 +20,7 @@ public class Constants {
     public static int limitbg = 2;
     public static int limithd = 3;
     public static int limithg = 1;
-    
-
 
     public static int BrasTelescopique = 5;
-
-
-
-
-
-
-<<<<<<< HEAD
-
-
-    public static int actuateur = 4;
-
-    public static int actuateur = 4;
-    // pneumatique
-    public static int pistonpinceouvre = 0;
-    public static int pistonpinceferme = 1;
-    public static int BrasTelescopique = 5;
-    public static int actuateur = 4;
-=======
-    
->>>>>>> 0c37463a91f99a8623a1405743145ad70a140362
-
 }
+  
\ No newline at end of file
diff --git a/src/main/java/frc/robot/commands/Gyro.java b/src/main/java/frc/robot/commands/Gyro.java
index ffc3a22..f2dd5b8 100644
--- a/src/main/java/frc/robot/commands/Gyro.java
+++ b/src/main/java/frc/robot/commands/Gyro.java
@@ -33,7 +33,7 @@ public class Gyro extends CommandBase {
    }
    else
    {
-     basvjePilotable.drive(0, 0, 0); 
+     basePilotable.drive(0, 0, 0); 
    }
 }