fix(client): merge conflict

Author: im-yuuki

client/src/main/java/io/exterminator3618/client/screens/GameScreen.java

@@ -602,6 +602,10 @@ public int getLives(){
         return lives;
     }
 
+    public int getScore() {
+        return score;
+    }
+
     public void setLives(int lives){
         if (lives > 5) {
             this.lives = 5;

client/src/main/java/io/exterminator3618/client/screens/OnlineGameScreen.java

@@ -147,7 +147,7 @@ protected void gotoGameOverScreen() {
     }
 
     @Override
-    protected void gotoVictoryScreen() {
+    public void gotoVictoryScreen() {
         client.setInMatch(false);
         finished = true;
         StringBuilder sb = new StringBuilder("You have finished the game!");
@@ -161,7 +161,7 @@ protected void gotoVictoryScreen() {
     }
 
     @Override
-    protected void gotoWinLevelScreen(int level) {
+    public void gotoWinLevelScreen(int level) {
         gotoVictoryScreen();
     }