ALL POST-MERGE ERRORS FIXED

src/main/java/frc4388/robot/commands/AimToCenter.java

@@ -38,7 +38,7 @@ public class AimToCenter extends CommandBase {
   // Called every time the scheduler runs while the command is scheduled.
   @Override
   public void execute() {
-    m_targetAngle = angleToCenter(x, y, m_drive.gyro.getAngle());
+    m_targetAngle = angleToCenter(x, y, m_drive.getRegGyro().getDegrees());
     m_turret.runshooterRotatePID(m_targetAngle);
   }
 

src/test/java/frc4388/robot/subsystems/LEDSubsystemTest.java

@@ -6,6 +6,7 @@ package frc4388.robot.subsystems;
 
 import static org.junit.Assert.assertEquals;
 // import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mock;
 
 import org.junit.Test;