diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 4a5236f..2f46998 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -8,18 +8,10 @@ import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.XboxController;
 import edu.wpi.first.wpilibj2.command.Command;
 import edu.wpi.first.wpilibj2.command.Commands;
-import edu.wpi.first.wpilibj2.command.RunCommand;
-<<<<<<< HEAD
-import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
 import edu.wpi.first.wpilibj2.command.button.JoystickButton;
 import edu.wpi.first.wpilibj2.command.button.Trigger;
-=======
-<<<<<<< HEAD
+
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
-=======
-import edu.wpi.first.wpilibj2.command.button.JoystickButton;
->>>>>>> ded3f6018fe8a2c8b719139889c406330ff44003
->>>>>>> f1d0e3b3526aaeeafab0416ba8e92344786ea73c
 //subsystems
 import frc.robot.subsystems.BasePilotable;
 import frc.robot.subsystems.Gratte;