Fix merge conflicts

diff --combined src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index 0d9187a441b6a734e4fc0e61ef3d848a7034d16f,ab5eb66ffe6831db965cb078366dc21798e6f556..6e0c7acfb443a9106e46ed27d0c40e985732ebf4
--- 1/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
--- 2/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@@ -26,6 -26,7 +26,7 @@@ public class Shooter extends Subsystem 
    private Encoder encoder;
    private Lidar lidar;
    private Photogate photogate;
+   private boolean usePhotoGate;
  
    public Shooter() {
      shooter = new CANTalon(Constants.Shooter.PORT);
@@@ -38,6 -39,7 +39,7 @@@
  
      encoder = new Encoder(Constants.Shooter.ENCODER_PORT_A,
          Constants.Shooter.ENCODER_PORT_B, false, EncodingType.k4X);
+     usePhotoGate = true;
    }
  
    /***
@@@ -49,7 -51,10 +51,12 @@@
     */
  
    public boolean isBallInside() {
-     return photogate.isBallPresent();
++
+     if (usePhotogate())
+       return photogate.isBallPresent();
+     else
+       return true;
++
    }
  
    public void setSpeed(double speed) {
@@@ -113,6 -118,14 +120,14 @@@
      return false;
    }
  
+   public boolean usePhotogate() {
+     return this.usePhotoGate;
+   }
+ 
+   public void togglePhotoGate() {
+     this.usePhotoGate = !this.usePhotoGate;
+   }
+ 
    @Override
    protected void initDefaultCommand() {
    }