diff --git a/src/main/deploy/pathplanner/autos/1-BF-Mobility.auto b/src/main/deploy/pathplanner/autos/1-BF-Mobility.auto
deleted file mode 100644
index 971e5201..00000000
--- a/src/main/deploy/pathplanner/autos/1-BF-Mobility.auto
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "version": 1.0,
-  "startingPose": {
-    "position": {
-      "x": 0.73,
-      "y": 4.41
-    },
-    "rotation": -61.5
-  },
-  "command": {
-    "type": "sequential",
-    "data": {
-      "commands": [
-        {
-          "type": "race",
-          "data": {
-            "commands": [
-              {
-                "type": "named",
-                "data": {
-                  "name": "Cand-Sub"
-                }
-              },
-              {
-                "type": "wait",
-                "data": {
-                  "waitTime": 2.0
-                }
-              }
-            ]
-          }
-        },
-        {
-          "type": "path",
-          "data": {
-            "pathName": "SB-BL"
-          }
-        },
-        {
-          "type": "deadline",
-          "data": {
-            "commands": [
-              {
-                "type": "path",
-                "data": {
-                  "pathName": "BL-F5"
-                }
-              },
-              {
-                "type": "named",
-                "data": {
-                  "name": "Collect"
-                }
-              }
-            ]
-          }
-        }
-      ]
-    }
-  },
-  "folder": null,
-  "choreoAuto": false
-}
\ No newline at end of file
diff --git a/src/main/deploy/pathplanner/paths/BL-F5.path b/src/main/deploy/pathplanner/paths/BL-F5.path
index 20965769..5920608a 100644
--- a/src/main/deploy/pathplanner/paths/BL-F5.path
+++ b/src/main/deploy/pathplanner/paths/BL-F5.path
@@ -3,7 +3,6 @@
   "waypoints": [
     {
       "anchor": {
-<<<<<<<< HEAD:src/main/deploy/pathplanner/paths/Amp autoalign.path
         "x": 1.85,
         "y": 6.5
       },
@@ -11,36 +10,18 @@
       "nextControl": {
         "x": 1.85,
         "y": 6.550000000000001
-========
-        "x": 5.85285555186495,
-        "y": 1.1445653660538107
-      },
-      "prevControl": null,
-      "nextControl": {
-        "x": 6.94693201083977,
-        "y": 1.0773969622118975
->>>>>>>> main:src/main/deploy/pathplanner/paths/BL-F5.path
       },
       "isLocked": false,
       "linkedName": "BottomLine"
     },
     {
       "anchor": {
-<<<<<<<< HEAD:src/main/deploy/pathplanner/paths/Amp autoalign.path
         "x": 1.85,
         "y": 7.5
       },
       "prevControl": {
         "x": 1.85,
         "y": 7.45
-========
-        "x": 8.293678213604645,
-        "y": 0.77
-      },
-      "prevControl": {
-        "x": 6.94693201083977,
-        "y": 1.0305536160287727
->>>>>>>> main:src/main/deploy/pathplanner/paths/BL-F5.path
       },
       "nextControl": null,
       "isLocked": false,
diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index b475beb9..8ba579f0 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -182,9 +182,9 @@ protected void configureButtonBindings() {
 		// new Trigger(driver::getXButton).whileTrue(new InstantCommand(() -> drivetrain.brake()));
 
 		// smart shoot for the robot
-		new Trigger(driver::getAButton)
-			.whileTrue(new SmartShoot(flywheel, pivot, drivetrain, indexer, leds)
-			.deadlineWith(leds.enableState(LED_STATES.SHOOTING)));
+		// new Trigger(driver::getAButton)
+		// 	.whileTrue(new SmartShoot(flywheel, pivot, drivetrain, indexer, leds)
+		// 	.deadlineWith(leds.enableState(LED_STATES.SHOOTING)));
 
 		// aim at amp and stage tags for the robot
 		new Trigger(driver::getXButton)