diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin
index 98fece4..d9cd6e6 100644
Binary files a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin and b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin differ
diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock
index c2df6c5..3c5f0e4 100644
Binary files a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock and b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock differ
diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin
index e5cc545..9168148 100644
Binary files a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin and b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin differ
diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock
index b094980..2a0d5c7 100644
Binary files a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock and b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock differ
diff --git a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index ef9f0a7..f457502 100644
Binary files a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class b/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class
index 126434b..cb8da51 100644
Binary files a/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class and b/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class differ
diff --git a/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar b/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar
index af292ae..d71379c 100644
Binary files a/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar and b/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar differ
diff --git a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin
index e61e91a..e027b08 100644
Binary files a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin and b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java
index 1034c55..1fe9dfd 100644
--- a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java
+++ b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java
@@ -86,12 +86,10 @@ public class HappyBirdMain extends Application {
         menuButton.setLayoutX(575);
         menuButton.setLayoutY(625);
         menuButton.setVisible(false);
-<<<<<<< HEAD
         startGame.setVisible(false);
-=======
+
 
         //Button buttons[] = {startButton, highscoresButton, settingsButton};
->>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de
 
         int yPosition = 225;
         for (Button button : buttons) {
@@ -113,22 +111,20 @@ public class HappyBirdMain extends Application {
 
         startGame.setVisible(false);
 
-<<<<<<< HEAD
         Label nameLabel = new Label("Name:");
         Label acronymLabel = new Label("Kürzel:");
 
         Label startLabels[] = {nameLabel, acronymLabel};
-=======
-        startButton.setOnAction(event ->  {
+        startButton.setOnAction(event -> {
             headline.setText("Start");
-            for(Button button : buttons) {
+            for (Button button : buttons) {
                 button.setVisible(false);
                 menuButton.setVisible(true);
             }
->>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de
+        });
 
         int yPositionStartLabels = 225;
-        for(Label label : startLabels) {
+        for (Label label : startLabels) {
             label.setPrefSize(250, 50);
             label.setStyle("-fx-background-color: #DED894; " +
                     "-fx-text-fill: #000000; " +
@@ -154,7 +150,7 @@ public class HappyBirdMain extends Application {
         TextField inputFields[] = {name, acronym};
 
         int yPositionInputFields = 290;
-        for(TextField feld : inputFields) {
+        for (TextField feld : inputFields) {
             feld.setPrefSize(250, 50);
             feld.setStyle("-fx-font-size: 20px;" +
                     "-fx-font-weight: bold;");
@@ -167,6 +163,7 @@ public class HappyBirdMain extends Application {
             feld.setVisible(false);
         }
 
+
         startButton.setOnAction(event ->  {
             headline.setText("Start");
             for(Button button : buttons) {
@@ -188,11 +185,8 @@ public class HappyBirdMain extends Application {
         });
 
 
-<<<<<<< HEAD
-        startGame.setOnAction(event ->  {});
-=======
+        //startGame.setOnAction(event ->  {});
         //startButton.setOnAction(event ->  {});
->>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de