diff --git a/src/main/java/frc/robot/commands/Gyro.java b/src/main/java/frc/robot/commands/Gyro.java
index 2350667..9665ecb 100644
--- a/src/main/java/frc/robot/commands/Gyro.java
+++ b/src/main/java/frc/robot/commands/Gyro.java
@@ -30,19 +30,16 @@ public class Gyro extends CommandBase {
   public void execute() {
   if(basePilotable.getpitch()>4) 
    { 
-<<<<<<< HEAD
     basePilotable.drive(0.3*basePilotable.getpitch()/12, 0);
    }
    else if(basePilotable.getpitch()<-4) 
    { 
     basePilotable.drive(0.3*basePilotable.getpitch()/12, 0);
-=======
     basePilotable.drive(0.3*basePilotable.getpitch()/15, 0);
    }
    else if(basePilotable.getpitch()<-4) 
    { 
     basePilotable.drive(0.3*basePilotable.getpitch()/15, 0);
->>>>>>> 3d2364b54822fb53a6cd71a0347d11baeef62001
    }
    else
    {