Fix merge conflicts.

diff --cc src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index f5d0384121d24ef8663d339f8e62ed8bb377f603,ac72556eace3ca4d220091f9c8fa0170f847b9a6..94501567cbac31e47e2ef70a9da5ae4815b3763b
--- 1/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
--- 2/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@@ -17,32 -17,15 +17,17 @@@ public class CameraFeeds 
    private static CameraFeeds cameraFeeds = null;
  
    @SuppressWarnings("deprecation")
-   public CameraFeeds(/* Joystick Button */) {
-     // Get camera id by supplying camera name example 'cam0', found on roborio
-     // web
-     // interface
-     /*
-      * intakeCam =
-      * NIVision.IMAQdxOpenCamera(Constants.CameraFeeds.camNameCenter,
-      * NIVision.IMAQdxCameraControlMode.CameraControlModeController); climberCam
-      * = NIVision.IMAQdxOpenCamera(Constants.CameraFeeds.camNameRight,
-      * NIVision.IMAQdxCameraControlMode.CameraControlModeController); curCam =
-      * intakeCam; // Image that will contain camera image frame =
-      * NIVision.imaqCreateImage(NIVision.ImageType.IMAGE_RGB, 0); // Server that
-      * we'll give the image to server = CameraServer.getInstance();
-      * server.setSize(Constants.CameraFeeds.imgQuality);
-      */
+   private CameraFeeds(/* Joystick Button */) {
  
 +    usbCamName = intakeCam.getName();
 +    axisCamName = climberCam.getName();
      server = CameraServer.getInstance();
 -    climberCam = server.addAxisCamera("axisCamera", "10.35.1.11");
 +    climberCam = server.addAxisCamera(axisCamName, "10.35.1.11");
      intakeCam = server.startAutomaticCapture();
- 
-     // server = CameraServer.getInstance();
-     // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
-     // cameraFeeds = new CameraFeeds();
 +    curCam = intakeCam;
 -
+     curCam = climberCam;
+     usbCamName = intakeCam.getName();
+     axisCamName = climberCam.getName();
    }
  
    public static CameraFeeds getCameraFeeds() {
@@@ -58,16 -41,20 +43,17 @@@
    }
  
    public void toggleCamera() {
+     System.out.println("enter toggleCamer");
      if (curCam.equals(intakeCam)) {
 -      changeCam(climberCam);
 +      // changeCam(climberCam);
        curCam = climberCam;
 -      System.out.println("Switching to climber camera.");
 -      return;
 -    }
 -
 -    if (curCam.equals(climberCam)) {
 -      changeCam(intakeCam);
 +      // System.out.println("Switching to climber camera.");
 +    } else if (curCam.equals(climberCam)) {
 +      // changeCam(intakeCam);
        curCam = intakeCam;
 -      System.out.println("Switching to intake camera.");
 -      return;
 +      // System.out.println("Switching to intake camera.");
      }
 +    changeCam(curCam);
    }
  
    /**
@@@ -77,18 -64,12 +63,25 @@@
     * newId for camera
     */
    public void changeCam(VideoSource cam) {
 +    server.removeCamera(curCam.getName());
 +    if (curCam.equals(intakeCam)) {
 +      server.addCamera(intakeCam);
 +      System.out.println("Switching to climber camera.");
 +      return;
 +    }
 +
 +    if (curCam.equals(climberCam)) {
 +      server.addAxisCamera(axisCamName, "10.35.1.11");
 +      // server.addCamera(climberCam);
 +      System.out.println("Switching to intake camera.");
 +      return;
 +    }
+     System.out.println("change camera");
+     server.removeCamera(curCam.getName());
+     server.addCamera(cam);
+   }
+ 
+   public String getCurrentCamName() {
+     return curCam.getName();
    }
  }

diff --cc src/org/usfirst/frc/team3501/robot/OI.java
index 65f555e15b5b181cc001231c9be31e73e277c51f,5082911be4703b6a55a674aad623f05b9507ab05..42a01369f5fae3ff15cfde14f648ad55fc2a3b9a
--- 1/src/org/usfirst/frc/team3501/robot/OI.java
--- 2/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@@ -1,7 -1,7 +1,6 @@@
  package org.usfirst.frc.team3501.robot;
  
  import org.usfirst.frc.team3501.robot.commands.accessories.ToggleCameraFeed;
--import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
  
  import edu.wpi.first.wpilibj.Joystick;
  import edu.wpi.first.wpilibj.buttons.Button;
@@@ -23,16 -23,17 +22,16 @@@ public class OI 
    public OI() {
      leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
      rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
-     toggleWinch = new JoystickButton(leftJoystick,
 -    /*toggleWinch = new JoystickButton(leftJoystick,
--        Constants.OI.TOGGLE_WINCH_PORT);
--    toggleIndexWheel = new JoystickButton(leftJoystick,
--        Constants.OI.TOGGLE_INDEXWHEEL_PORT);
--    toggleFlyWheel = new JoystickButton(leftJoystick,
--        Constants.OI.TOGGLE_FLYWHEEL_PORT);
--
--    toggleGear = new JoystickButton(leftJoystick,
--        Constants.OI.TOGGLE_GEAR_PORT);
--    toggleGear.whenPressed(new ToggleGear());
 -    */
++    /*
++     * toggleWinch = new JoystickButton(leftJoystick,
++     * Constants.OI.TOGGLE_WINCH_PORT); toggleIndexWheel = new
++     * JoystickButton(leftJoystick, Constants.OI.TOGGLE_INDEXWHEEL_PORT);
++     * toggleFlyWheel = new JoystickButton(leftJoystick,
++     * Constants.OI.TOGGLE_FLYWHEEL_PORT);
++     * 
++     * toggleGear = new JoystickButton(leftJoystick,
++     * Constants.OI.TOGGLE_GEAR_PORT); toggleGear.whenPressed(new ToggleGear());
++     */
  
      toggleCameraFeeds = new JoystickButton(leftJoystick,
          Constants.OI.TOGGLE_CAMERA_FEEDS);

diff --cc src/org/usfirst/frc/team3501/robot/Robot.java
index 9efe44f0480b4291a5e9aa5c8275847745b856b1,d467182080a4343d91d6fd6bcefd22ca8310659e..e7c5e5b1928398f30bc31fd42c0c5bc43f87634f
--- 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
@@@ -25,12 -25,24 +25,25 @@@ public class Robot extends IterativeRob
      oi = OI.getOI();
      shooter = Shooter.getShooter();
      intake = Intake.getIntake();
--
 +    cameraServer2 = CameraServer.getInstance();
 +    axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
- 
 +    cameraFeeds = new CameraFeeds();
+     cameraFeeds = CameraFeeds.getCameraFeeds();
+ 
+     // usbCamera = CameraServer.getInstance().startAutomaticCapture();
+ 
+     // cameraServer2 = CameraServer;getInstance();
+     // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
  
 -
+     // cameraServer2 = CameraServer.getInstance();
+     // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+ 
+     // usbCamera = CameraServer.getInstance().startAutomaticCapture();
+     // CameraServer.getInstance().startAutomaticCapture();
+     // cameraServer2 = CameraServer.getInstance();
+     // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+ 
+     // cameraFeeds = new CameraFeeds();
    }
  
    public static DriveTrain getDriveTrain() {
@@@ -64,7 -80,7 +81,6 @@@
  
    @Override
    public void teleopInit() {
-     cameraFeeds.init();
 -
    }
  
    @Override