Fix merge conflicts

diff --cc 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
@@@ -49,7 -51,10 +51,12 @@@ public class Shooter extends Subsystem 
     */
  
    public boolean isBallInside() {
-     return photogate.isBallPresent();
++
+     if (usePhotogate())
+       return photogate.isBallPresent();
+     else
+       return true;
++
    }
  
    public void setSpeed(double speed) {