diff --git a/Happy_Bird/.gradle/7.1.1/dependencies-accessors/dependencies-accessors.lock b/Happy_Bird/.gradle/7.1.1/dependencies-accessors/dependencies-accessors.lock
index 1504b9c..367093e 100644
Binary files a/Happy_Bird/.gradle/7.1.1/dependencies-accessors/dependencies-accessors.lock and b/Happy_Bird/.gradle/7.1.1/dependencies-accessors/dependencies-accessors.lock differ
diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin
index 98fece4..20187b7 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..5358355 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..eaaa85c 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..0d4901e 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..636d40c 100644
Binary files a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/Happy_Bird/.gradle/checksums/checksums.lock b/Happy_Bird/.gradle/checksums/checksums.lock
index 3d09054..23d6a8a 100644
Binary files a/Happy_Bird/.gradle/checksums/checksums.lock and b/Happy_Bird/.gradle/checksums/checksums.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..f57fc66 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..cc137e4 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..2af1e05 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..c20107e 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,12 @@ 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,19 +113,19 @@ 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) {
@@ -188,11 +188,10 @@ public class HappyBirdMain extends Application {
         });
 
 
-<<<<<<< HEAD
-        startGame.setOnAction(event ->  {});
-=======
+
+        //startGame.setOnAction(event ->  {});
+
         //startButton.setOnAction(event ->  {});
->>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de