diff --git a/ftc2024-carlike.java b/ftc2024-carlike.java
index 6dda021..1e4b595 100644
--- a/ftc2024-carlike.java
+++ b/ftc2024-carlike.java
@@ -342,20 +342,6 @@ public class Werobot_FTC2024_carlike extends LinearOpMode {
                 // launch the plane
             }
 
-<<<<<<< HEAD
-			telemetry.addData("x", x);
-			telemetry.addData("y", y);
-			telemetry.addData("lpow", lpower);
-			telemetry.addData("rpow", rpower);
-			telemetry.addData("ltrigg", t);
-			telemetry.addData("t2", t2);
-			// Create an object to receive the IMU angles
-			YawPitchRollAngles robotOrientation;
-			robotOrientation = imu.getRobotYawPitchRollAngles();
-=======
-
-            
-
             telemetry.addData("x", x);
             telemetry.addData("y", y);
             telemetry.addData("lpow", lpower);
@@ -365,8 +351,6 @@ public class Werobot_FTC2024_carlike extends LinearOpMode {
             // Create an object to receive the IMU angles
             YawPitchRollAngles robotOrientation;
             robotOrientation = imu.getRobotYawPitchRollAngles();
->>>>>>> cdd50be8b9f970f1db99003d4c401bf7dafa25b6
-
             // Now use these simple methods to extract each angle
             // (Java type double) from the object you just created:
             double Yaw = robotOrientation.getYaw(AngleUnit.DEGREES);
@@ -374,14 +358,7 @@ public class Werobot_FTC2024_carlike extends LinearOpMode {
             double Roll = robotOrientation.getRoll(AngleUnit.DEGREES);
             telemetry.addData("yaw", Yaw);
 
-<<<<<<< HEAD
-			telemetry.update();
-		}
-	}
-}
-=======
             telemetry.update();
         }
     }
 }
->>>>>>> cdd50be8b9f970f1db99003d4c401bf7dafa25b6
diff --git a/ftc_new.java b/ftc_new.java
index e4c7fea..124d18e 100644
--- a/ftc_new.java
+++ b/ftc_new.java
@@ -23,7 +23,7 @@ import org.firstinspires.ftc.robotcore.external.navigation.Orientation;
 import org.firstinspires.ftc.robotcore.external.navigation.Position;
 import org.firstinspires.ftc.robotcore.external.navigation.Velocity;
 
-@TeleOp(name = "WeRobot: FTC2024 New Carlike", group = "WeRobot")
+@TeleOp(name = "WeRobot: FTC2024 NEW!!! Carlike", group = "WeRobot")
 public class WEROBOT_FTC2024_New_carlike extends LinearOpMode {
 
     private DcMotor rm;
@@ -317,7 +317,7 @@ public class WEROBOT_FTC2024_New_carlike extends LinearOpMode {
 
             // activation rotation
             if (manualMode){
-                gamepad1.setLedColor(255,100,50,10);
+		gamepad1.setLedColor(255,0,0,10);
                 lmelevator.setMode(DcMotor.RunMode.RUN_USING_ENCODER);
                 rmelevator.setMode(DcMotor.RunMode.RUN_USING_ENCODER);
                 rotation.setMode(DcMotor.RunMode.RUN_USING_ENCODER);
@@ -375,6 +375,7 @@ public class WEROBOT_FTC2024_New_carlike extends LinearOpMode {
             telemetry.addData("rpow", rpower);
             telemetry.addData("ltrigg", t);
             telemetry.addData("t2", t2);
+	    telemetry.addData("manual mode", manualMode);
             telemetry.addData("rotation power",boxRot);
             telemetry.addData("mode manuel", manualMode);
             telemetry.addData("Position elevateur l", lmelevator.getCurrentPosition());
@@ -385,4 +386,4 @@ public class WEROBOT_FTC2024_New_carlike extends LinearOpMode {
             telemetry.update();
         }
     }
-}
\ No newline at end of file
+}