diff --git a/src/core/execution/WinCheckExecution.ts b/src/core/execution/WinCheckExecution.ts
index 66646d3b1..d5a460bea 100644
--- a/src/core/execution/WinCheckExecution.ts
+++ b/src/core/execution/WinCheckExecution.ts
@@ -31,11 +31,7 @@ export class WinCheckExecution implements Execution {
 
     if (this.mg.config().gameConfig().gameMode === GameMode.FFA) {
       this.checkWinnerFFA();
-<<<<<<< Updated upstream
-    } else {
-=======
     } else if (gameMode === GameMode.NukeWars || gameMode === GameMode.Team) {
->>>>>>> Stashed changes
       this.checkWinnerTeam();
     }
   }