Fix merge conflicts

diff --cc 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,8 -20,8 +20,8 @@@ 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;