From eb1d0714f1fb56d3f3a720fdf5b82e00e2f1a48b Mon Sep 17 00:00:00 2001
From: Christopher Schmidt <schmidtc086@outlook.com>
Date: Mon, 26 Aug 2024 12:00:47 -0400
Subject: [PATCH] Attempts to resolve merge conflicts

---
 src/data/move.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/data/move.ts b/src/data/move.ts
index 02055561265..b9579273cfb 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -5339,7 +5339,7 @@ export class RandomMoveAttr extends OverrideMoveEffectAttr {
 export class RandomMovesetMoveAttr extends RandomMoveAttr {
   private includeParty: boolean;
   private moveId: number;
-  constructor(invalidMoves: Moves[], includeParty?: boolean) {
+  constructor(invalidMoves: Moves[], includeParty: boolean = false) {
     super(invalidMoves);
     this.includeParty = includeParty;
   }
@@ -5366,12 +5366,12 @@ export class RandomMovesetMoveAttr extends RandomMoveAttr {
         allies = [user];
       }
       const partyMoveset = allies.map(p => p.moveset).flat();
-      const moves = partyMoveset.filter(m => !this.invalidMoves.includes(m.moveId) && !m.getMove().name.endsWith(" (N)"));
+      const moves = partyMoveset.filter(m => !this.invalidMoves.includes(m!.moveId) && !m!.getMove().name.endsWith(" (N)"));
       if (moves.length === 0) {
         return false;
       }
 
-      this.moveId = moves[user.randSeedInt(moves.length)].moveId;
+      this.moveId = moves[user.randSeedInt(moves.length)]!.moveId;
       return true;
     };
   }