Highscores einfügen & Score im Spiel

Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java

@@ -484,6 +484,7 @@ public class HappyBirdMain extends Application {
         highscoreLabel.setVisible(false);
         currentScoreLabel.setVisible(false);
         soundLabel.setVisible(false);
+        highscoreMenuLabel.setVisible(false);
 
         /*Click-Events*/
         startGameButton.setOnAction(event -> startGameButtonClick());
@@ -626,14 +627,11 @@ public class HappyBirdMain extends Application {
         settingsButton.setVisible(true);
         menuButton.setVisible(false);
         startGameButton.setVisible(false);
-<<<<<<< HEAD
         highscoreMenuLabel.setVisible(false);
-=======
 
         background1.setVisible(false);
         background2.setVisible(false);
 
->>>>>>> 7f359cb01fb2872353dbcf5aa715e11820a54013
         /*soundSlider ausblenden*/
         soundSlider.setVisible(false);