diff --git a/src/main/java/frc/robot/constants/ArmConstants.java b/src/main/java/frc/robot/constants/ArmConstants.java
index 32846c4..f222b5f 100644
--- a/src/main/java/frc/robot/constants/ArmConstants.java
+++ b/src/main/java/frc/robot/constants/ArmConstants.java
@@ -5,9 +5,6 @@ public class ArmConstants {
     public static final int kCANcoderID = 0;
 
     public static final double kEncoderConversionFactor = 0;
-<<<<<<< HEAD
 
     public static final double kArmMaxVelocity = 0;
-=======
->>>>>>> f4908e4051cd2c1ce41df73debe5e7e2cc506c4a
 }