fixed merge conflict in Robot.java

diff --cc src/org/usfirst/frc/team3501/robot/Robot.java
index 8fd099fb2999081e999638cb08d2e46b9872297f,99f66213b193728ddf53e4f1927785d979df62e9..80d786762994a72067d56a36d2d4c8ce7d1cb29e
--- 1/src/org/usfirst/frc/team3501/robot/Robot.java
--- 2/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@@ -1,7 -1,7 +1,6 @@@
  package org.usfirst.frc.team3501.robot;
  
  import org.usfirst.frc.team3501.robot.Constants.Defense;
- import org.usfirst.frc.team3501.robot.sensors.GyroLib;
 -import org.usfirst.frc.team3501.robot.sensors.Photogate;
  import org.usfirst.frc.team3501.robot.subsystems.DefenseArm;
  import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
  import org.usfirst.frc.team3501.robot.subsystems.IntakeArm;
@@@ -27,11 -26,10 +25,8 @@@ public class Robot extends IterativeRob
    // Sendable Choosers send a drop down menu to the Smart Dashboard.
    SendableChooser positionChooser;
    SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense,
 -  positionFourDefense, positionFiveDefense;
 +      positionFourDefense, positionFiveDefense;
  
-   // Gyro stuff
-   public GyroLib gyro;
- 
    @Override
    public void robotInit() {
      driveTrain = new DriveTrain();

diff --cc src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index 60452a0c9080bfe4bf61beb2c129ce0be2b37717,3633c04ca10e2fea9e5c63a656427a86642eaea1..0d9187a441b6a734e4fc0e61ef3d848a7034d16f
--- 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
@@@ -22,11 -21,9 +22,10 @@@ import edu.wpi.first.wpilibj.command.Su
  
  public class Shooter extends Subsystem {
    private CANTalon shooter;
-   private CANTalon angleAdjuster;
-   private DoubleSolenoid hood, punch;
+   private DoubleSolenoid hood1, hood2, punch;
    private Encoder encoder;
    private Lidar lidar;
 +  private Photogate photogate;
  
    public Shooter() {
      shooter = new CANTalon(Constants.Shooter.PORT);