diff --git a/src/data/move.ts b/src/data/move.ts
index d9a6742f6e4..0b3e757c2a2 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -3376,8 +3376,12 @@ export class ReducePpMoveAttr extends MoveEffectAttr {
     }
     const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move);
     const lastPpUsed = movesetMove.ppUsed;
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
     if (!lastMove || lastPpUsed < 1) {
+=======
+    if (lastPpUsed < 1) {
+>>>>>>> Stashed changes
 =======
     if (lastPpUsed < 1) {
 >>>>>>> Stashed changes