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 035f72b..1034c55 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,7 +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) {
@@ -108,10 +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 ->  {
+            headline.setText("Start");
+            for(Button button : buttons) {
+                button.setVisible(false);
+                menuButton.setVisible(true);
+            }
+>>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de
 
         int yPositionStartLabels = 225;
         for(Label label : startLabels) {
@@ -174,7 +188,11 @@ public class HappyBirdMain extends Application {
         });
 
 
+<<<<<<< HEAD
         startGame.setOnAction(event ->  {});
+=======
+        //startButton.setOnAction(event ->  {});
+>>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de