diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 45a8132..f1768c6 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -3,12 +3,8 @@
 // the WPILib BSD license file in the root directory of this project.
 
 package frc.robot;
-
-import edu.wpi.first.math.estimator.KalmanFilter;
 import edu.wpi.first.wpilibj.GenericHID;
-import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.XboxController;
-import edu.wpi.first.wpilibj.XboxController.Button;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import edu.wpi.first.wpilibj2.command.Command;
 import edu.wpi.first.wpilibj2.command.RunCommand;
@@ -27,15 +23,6 @@ import frc.robot.commands.TournerDroite;
 import frc.robot.commands.TournerGauche;
 import frc.robot.commands.Activershaker;
 import frc.robot.commands.Avancer;
-<<<<<<< HEAD
-import frc.robot.commands.Activershaker;
-import frc.robot.commands.DesactiverBlockeur;
-=======
-
->>>>>>> 869bfef8ba736e41bb36cd549d19ffe8bd68c766
-
-
-
 import frc.robot.commands.BoutonA;
 
 /**