diff --git a/ftc2024_autonome_api.java b/ftc2024_autonome_api.java
index 2b3a3a5..4424484 100644
--- a/ftc2024_autonome_api.java
+++ b/ftc2024_autonome_api.java
@@ -32,7 +32,11 @@ public class Ftc2024_autonome_api extends LinearOpMode {
 	public void runOpMode() {
 		lm = hardwareMap.get(DcMotor.class, "blm");
 		rm = hardwareMap.get(DcMotor.class, "brm");
+<<<<<<< HEAD
 		harvestmotor = hardwareMap.get(DcMotor.class, "moissonneuse");
+=======
+		harvestmotor = hardwareMap.get(DcMotor.class, "moissoneuse");
+>>>>>>> a8ae6d3 (hello)
 
 		rm.setDirection(DcMotor.Direction.REVERSE);