fix merge

app/src/main/java/chess/view/consolerender/Console.java

@@ -13,8 +13,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Scanner;
 
-import static java.lang.System.exit;
-
 public class Console implements GameListener {
     private final Scanner scanner = new Scanner(System.in);
     private final CommandExecutor commandExecutor;
@@ -80,8 +78,7 @@ public class Console implements GameListener {
 
     private boolean playerPickedSurrender(Color color) {
         sendCommand(new SurrenderCommand(color));
-        hasSurrendered(color);
-        return false;
+        return true;
     }
 
     public boolean playerPickedMove() {
@@ -128,6 +125,7 @@ public class Console implements GameListener {
     @Override
     public void winnerIs(Color color) {
         System.out.println(Colors.RED + "Victory of player " + color + Colors.RESET);
+        gameEnded();
     }
 
     @Override
@@ -139,18 +137,17 @@ public class Console implements GameListener {
     @Override
     public void kingIsInMat() {
         System.out.println(Colors.RED + "Checkmate!" + Colors.RESET);
-        gameEnded();
     }
 
     @Override
     public void patSituation() {
         // todo
+        gameEnded();
     }
 
     @Override
     public void hasSurrendered(Color color) {
         System.out.println("The " + color + " player has surrendered!");
-        gameEnded(Color.getEnemy(color));
     }
 
     @Override
@@ -161,12 +158,7 @@ public class Console implements GameListener {
 
     public void gameEnded(){
         System.out.println("Thank you for playing!");
-        exit(0);
-    }
-
-    public void gameEnded(Color winner){
-        winnerIs(winner);
-        gameEnded();
+        System.exit(0);
     }
 
     @Override