diff --git a/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml b/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml
index 2301392..ac1c9d6 100644
--- a/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml
+++ b/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml
@@ -7,13 +7,10 @@
 
 <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>
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 c20107e..713e65b 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,18 @@ public class HappyBirdMain extends Application {
         menuButton.setLayoutX(575);
         menuButton.setLayoutY(625);
         menuButton.setVisible(false);
+<<<<<<< HEAD
 
+=======
+>>>>>>> 6697cdef8e121846595c7e99f811d1088227faa6
         startGame.setVisible(false);
 
 
         //Button buttons[] = {startButton, highscoresButton, settingsButton};
+<<<<<<< HEAD
 
+=======
+>>>>>>> 6697cdef8e121846595c7e99f811d1088227faa6
 
         int yPosition = 225;
         for (Button button : buttons) {
@@ -113,12 +119,18 @@ public class HappyBirdMain extends Application {
 
         startGame.setVisible(false);
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 6697cdef8e121846595c7e99f811d1088227faa6
         Label nameLabel = new Label("Name:");
         Label acronymLabel = new Label("Kürzel:");
 
         Label startLabels[] = {nameLabel, acronymLabel};
+<<<<<<< HEAD
 
+=======
+>>>>>>> 6697cdef8e121846595c7e99f811d1088227faa6
         startButton.setOnAction(event -> {
             headline.setText("Start");
             for (Button button : buttons) {
@@ -128,7 +140,7 @@ public class HappyBirdMain extends Application {
         });
 
         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 +166,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 +179,7 @@ public class HappyBirdMain extends Application {
             feld.setVisible(false);
         }
 
+
         startButton.setOnAction(event ->  {
             headline.setText("Start");
             for(Button button : buttons) {
@@ -188,9 +201,7 @@ public class HappyBirdMain extends Application {
         });
 
 
-
         //startGame.setOnAction(event ->  {});
-
         //startButton.setOnAction(event ->  {});