Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml

@@ -7,13 +7,4 @@
 
 <StackPane prefHeight="800.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.happy_bird.HappyBird" back >
 
-<<<<<<< HEAD
-=======
-    <ImageView>
-        <image>
-            <Image url="@pics/Background.png"></Image>
-        </image>
-    </ImageView>
-
->>>>>>> 5db5b6bb195a2b7d1296e7d3f9b98d6c75dba2c2
 </StackPane>

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

@@ -87,7 +87,7 @@ public class HappyBirdMain extends Application {
         menuButton.setLayoutY(625);
         menuButton.setVisible(false);
 
-        //Button buttons[] = {startButton, highscoresButton, settingsButton};
+        Button buttons[] = {startButton, highscoresButton, settingsButton};
 
         int yPosition = 225;
         for (Button button : buttons) {
@@ -113,7 +113,7 @@ public class HappyBirdMain extends Application {
             headline.setText("Start");
             for(Button button : buttons) {
                 button.setVisible(false);
-                menuButton.setVisible(true);
+
             }
 
             Label nameLabel = new Label("Name:");
@@ -165,7 +165,7 @@ public class HappyBirdMain extends Application {
         });
 
 
-        //startButton.setOnAction(event ->  {});
+        startButton.setOnAction(event ->  {});