readded my changes?

Author: devinisaperson

build.gradle

@@ -52,13 +52,8 @@ def includeDesktopSupport = true
 // Configuration for AdvantageKit
 repositories {
     maven {
-        url = uri("https://maven.pkg.github.com/Mechanical-Advantage/AdvantageKit")
-        credentials {
-            username = "Mechanical-Advantage-Bot"
-            password = "\u0067\u0068\u0070\u005f\u006e\u0056\u0051\u006a\u0055\u004f\u004c\u0061\u0079\u0066\u006e\u0078\u006e\u0037\u0051\u0049\u0054\u0042\u0032\u004c\u004a\u006d\u0055\u0070\u0073\u0031\u006d\u0037\u004c\u005a\u0030\u0076\u0062\u0070\u0063\u0051"
-        }
+        url = uri("https://frcmaven.wpi.edu/artifactory/littletonrobotics-mvn-release")
     }
-    mavenLocal()
 }
 
 configurations.all {

src/main/java/frc/robot/BuildConstants.java

@@ -5,21 +5,12 @@ public final class BuildConstants {
   public static final String MAVEN_GROUP = "";
   public static final String MAVEN_NAME = "2024RobotCode";
   public static final String VERSION = "unspecified";
-<<<<<<< Updated upstream
-  public static final int GIT_REVISION = 357;
-  public static final String GIT_SHA = "3ef842811300f6ae93f92b9acc1813edc4af7f2f";
-  public static final String GIT_DATE = "2024-10-19 17:38:18 EDT";
-  public static final String GIT_BRANCH = "bloomfield";
-  public static final String BUILD_DATE = "2024-10-19 18:17:32 EDT";
-  public static final long BUILD_UNIX_TIME = 1729376252676L;
-=======
   public static final int GIT_REVISION = 359;
-  public static final String GIT_SHA = "34f1402c7f7ff5c12d12c6dcd907953b5f3c70ea";
-  public static final String GIT_DATE = "2025-05-15 18:52:07 EDT";
-  public static final String GIT_BRANCH = "outreach";
-  public static final String BUILD_DATE = "2025-05-15 19:14:04 EDT";
-  public static final long BUILD_UNIX_TIME = 1747350844263L;
->>>>>>> Stashed changes
+  public static final String GIT_SHA = "c00cc913b1bd093f9c03fa99d6a071318bea5c75";
+  public static final String GIT_DATE = "2025-05-15 19:29:45 EDT";
+  public static final String GIT_BRANCH = "FAR";
+  public static final String BUILD_DATE = "2025-05-17 14:36:47 EDT";
+  public static final long BUILD_UNIX_TIME = 1747507007634L;
   public static final int DIRTY = 1;
 
   private BuildConstants() {}

src/main/java/frc/robot/RobotContainer.java

@@ -675,9 +675,7 @@ private void driverControls() {
 
     driveXButton.onTrue(trapCommands);
 
-    driveController
-        .rightStick()
-        .onTrue(new ShootNoteFAR(shooter));
+    driveController.rightStick().onTrue(new ShootNoteFAR(shooter));
   }
 
   private void manipControls() {