Fix merge conflicts

diff --combined src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index 07cf52e6a4e445150b7eb2d59c6637f475dd2b3c,b18fbca8cebb663f1f009ff0f4f718346fe77488..d1b0ac0970a5820ac91476a5d3d34c01811186a1
--- 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
@@@ -20,26 -20,24 +20,26 @@@ public class CameraFeeds 
    private CameraFeeds(/* Joystick Button */) {
      System.out.println("Enter CameraFeeds constructor");
      server = CameraServer.getInstance();
-     climberCam = server.addAxisCamera("AxisCamera", "10.35.1.11");
+     climberCam = server.addAxisCamera("ClimberCam", "10.35.1.11");
 -    // intakeCam = server.startAutomaticCapture();
 +    intakeCam = server.startAutomaticCapture();
      usbCamName = intakeCam.getName();
      axisCamName = climberCam.getName();
      curCam = climberCam;
      changeCam(curCam);
 +    System.out.println("Leaving CameraFeeds constructor");
    }
  
    public static CameraFeeds getCameraFeeds() {
 +    System.out.println("Enter CameraFeeds.getCameraFeeds");
      if (cameraFeeds == null) {
        cameraFeeds = new CameraFeeds();
      }
 +    System.out.println("Leaving CameraFeeds.getCameraFeeds");
      return cameraFeeds;
 -
    }
  
    public void init() {
 -    // changeCam(climberCam);
 +    System.out.println("Initializing...");
    }
  
    public void toggleCamera() {
@@@ -47,11 -45,13 +47,13 @@@
      if (curCam.equals(intakeCam)) {
        changeCam(climberCam);
        curCam = climberCam;
-       System.out.println("Switching to climber camera.");
+       System.out
+           .println("Switching to climber camera, curCam = " + curCam.getName());
      } else if (curCam.equals(climberCam)) {
        changeCam(intakeCam);
        curCam = intakeCam;
-       System.out.println("Switching to intake camera.");
+       System.out
+           .println("Switching to intake camera, curCam = " + curCam.getName());
      }
    }
  
@@@ -62,7 -62,6 +64,7 @@@
     * newId for camera
     */
    public void changeCam(VideoSource cam) {
 -    server.removeCamera(curCam.getName());
 +    System.out.println("Changing cameras...");
 +    server.getVideo(cam);
    }
  }