diff --git a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java
index 08f983b..e015295 100644
--- a/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java
+++ b/src/main/java/frc/robot/subsystems/bras/BrasTelescopique.java
@@ -8,10 +8,7 @@ package frc.robot.subsystems.bras;
 import com.revrobotics.CANSparkMax;
 import com.revrobotics.CANSparkMaxLowLevel.MotorType;
 
-<<<<<<< HEAD
 import edu.wpi.first.wpilibj.DigitalInput;
-=======
->>>>>>> Dash
 import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
 import frc.robot.Constants;
@@ -35,10 +32,7 @@ public class BrasTelescopique extends SubsystemBase {
   }
   @Override
   public void periodic() {
-<<<<<<< HEAD
     Shuffleboard.getTab("SmartDashBoard") .add("photocell",0.1);
-=======
     Shuffleboard.getTab("SmartDashBoard") .add("winch",0.1);
->>>>>>> Dash
   }
 }
diff --git a/src/main/java/frc/robot/subsystems/bras/Pivot.java b/src/main/java/frc/robot/subsystems/bras/Pivot.java
index b2494d0..421aa5c 100644
--- a/src/main/java/frc/robot/subsystems/bras/Pivot.java
+++ b/src/main/java/frc/robot/subsystems/bras/Pivot.java
@@ -4,10 +4,7 @@
 
 package frc.robot.subsystems.bras;
 
-<<<<<<< HEAD
 import edu.wpi.first.wpilibj.DigitalInput;
-=======
->>>>>>> Dash
 import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
 import frc.robot.Constants;
@@ -37,11 +34,8 @@ public class Pivot extends SubsystemBase {
   }
   @Override
   public void periodic() {
-<<<<<<< HEAD
     Shuffleboard.getTab("SmartDashBoard") .add("limitpivot",0.1);
   }
-=======
     Shuffleboard.getTab("SmartDashBoard") .add("pivot encodeur",0.1);
  }
->>>>>>> Dash
-}
+