k,

src/main/java/frc/robot/RobotContainer.java

@@ -13,12 +13,9 @@ import edu.wpi.first.wpilibj2.command.RunCommand;
 // Manette
 import edu.wpi.first.wpilibj2.command.button.CommandJoystick;
 import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
-<<<<<<< HEAD
 import frc.robot.command.Balayer;
-=======
 import frc.robot.command.GuiderBas;
 import frc.robot.command.GuiderHaut;
->>>>>>> 33990971eb46b4232501c29b34451800e658504b
 // Subsystem
 import frc.robot.subsystem.Accumulateur;
 import frc.robot.subsystem.Balayeuse;
@@ -37,9 +34,9 @@ public class RobotContainer {
   Guideur guideur = new Guideur();
   Lanceur lanceur = new Lanceur();
   Balayer balayer = new Balayer(balayeuse, accumulateur);
-
   GuiderHaut guiderHaut = new GuiderHaut(guideur);
   GuiderBas guiderBas = new GuiderBas(guideur);
+  
    CommandJoystick joystick = new CommandJoystick(0);
    CommandXboxController manette = new CommandXboxController(1);