diff --git a/src/main/java/baritone/bot/pathing/calc/Path.java b/src/main/java/baritone/bot/pathing/calc/Path.java
index 20a0aeac..e13dac25 100644
--- a/src/main/java/baritone/bot/pathing/calc/Path.java
+++ b/src/main/java/baritone/bot/pathing/calc/Path.java
@@ -1,9 +1,6 @@
 package baritone.bot.pathing.calc;
 
-<<<<<<< Updated upstream
-=======
 import baritone.bot.pathing.movement.Movement;
->>>>>>> Stashed changes
 import baritone.bot.pathing.goals.Goal;
 import baritone.bot.pathing.movement.Movement;
 import net.minecraft.util.math.BlockPos;