diff --git a/src/client/SinglePlayerModal.ts b/src/client/SinglePlayerModal.ts
index 37adf8c54..3a550a72b 100644
--- a/src/client/SinglePlayerModal.ts
+++ b/src/client/SinglePlayerModal.ts
@@ -48,14 +48,7 @@ export class SinglePlayerModal extends LitElement {
   @state() private teamCount: TeamCountConfig = 2;
 
   @state() private disabledUnits: UnitType[] = [];
-
-<<<<<<< Updated upstream
-=======
-  private readonly nukeWarsDisabledUnits = [
-    UnitType.MIRV,
-  ];
-
->>>>>>> Stashed changes
+  private readonly nukeWarsDisabledUnits = [UnitType.MIRV];
   private userSettings: UserSettings = new UserSettings();
 
   connectedCallback() {
diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts
index 21aa78e91..e145d4a02 100644
--- a/src/core/game/Game.ts
+++ b/src/core/game/Game.ts
@@ -151,6 +151,7 @@ export const isGameType = (value: unknown): value is GameType =>
 export enum GameMode {
   FFA = "Free For All",
   Team = "Team",
+  NukeWars = "Nuke Wars",
 }
 export const isGameMode = (value: unknown): value is GameMode =>
   isEnumValue(GameMode, value);