diff --git a/lib/publish.gradle b/lib/publish.gradle
index e64616e..30ea7f9 100644
--- a/lib/publish.gradle
+++ b/lib/publish.gradle
@@ -4,11 +4,7 @@ apply plugin: 'maven-publish'
 
 ext.licenseFile = files("$rootDir/LICENSE.txt")
 
-<<<<<<< Updated upstream
-def pubVersion = '2023.2.1'
-=======
-def pubVersion = '2023.3.0'
->>>>>>> Stashed changes
+def pubVersion = '2023.3.1'
 
 def outputsFolder = file("$buildDir/allOutputs")
 
diff --git a/lib/src/main/java/com/fairportrobotics/frc/poe/CameraTracking/RobotFieldPosition.java b/lib/src/main/java/com/fairportrobotics/frc/poe/CameraTracking/RobotFieldPosition.java
index a54535f..a4726ba 100644
--- a/lib/src/main/java/com/fairportrobotics/frc/poe/CameraTracking/RobotFieldPosition.java
+++ b/lib/src/main/java/com/fairportrobotics/frc/poe/CameraTracking/RobotFieldPosition.java
@@ -10,11 +10,9 @@ import org.photonvision.EstimatedRobotPose;
 
 import edu.wpi.first.apriltag.AprilTagFieldLayout;
 import edu.wpi.first.apriltag.AprilTagFields;
-<<<<<<< Updated upstream
 import edu.wpi.first.math.geometry.Pose2d;
-=======
 import edu.wpi.first.apriltag.AprilTagFieldLayout.OriginPosition;
->>>>>>> Stashed changes
+import edu.wpi.first.apriltag.AprilTagFieldLayout.OriginPosition;
 import edu.wpi.first.math.geometry.Transform3d;
 
 public class RobotFieldPosition {