diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 68127f1..3f2af21 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -20,21 +20,13 @@ import frc.robot.subsystems.Pistonshaker;
 // commands
 import frc.robot.commands.Activer_poussoir;
 import frc.robot.commands.ActiverBlockeur;
-<<<<<<< HEAD
-import frc.robot.commands.Activer_poussoir;
-=======
-<<<<<<< HEAD
 import frc.robot.commands.DesactiverBlockeur;
 import frc.robot.commands.Reculer;
 import frc.robot.commands.TournerDroite;
 import frc.robot.commands.TournerGauche;
 import frc.robot.commands.Activershaker;
 import frc.robot.commands.Avancer;
-=======
->>>>>>> db39b5c3db06eed46b45655b80bb22a24e971bb2
-import frc.robot.commands.Activershaker;
-import frc.robot.commands.DesactiverBlockeur;
->>>>>>> 3d2fed7d28e2c16a03399281bc03d1cf3df4f6d1
+