diff --git a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java
index 195db73..369c6a3 100644
--- a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java
+++ b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java
@@ -6,10 +6,11 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.lang.System.Logger;
 import java.util.Scanner;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.*;
 
 public class LogHighscores {
-    //private static final Logger logger = LogManager.getLogger(LogHighscores.class);
+    private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(LogHighscores.class);
 
     public static void newRecord(String path, String username, String time) throws FileNotFoundException {
         String timePart = time.substring("Zeit: ".length()).trim();
@@ -26,10 +27,6 @@ public class LogHighscores {
             sc.nextLine();
         }
         sc.close();
-        /*
-=======
-        
->>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
         try (BufferedWriter writer = new BufferedWriter(new FileWriter(filepath, true))) {
             String eintrag = timePart + " " + username;
             logger.info("Neuer Eintrag: {}", eintrag);
@@ -39,6 +36,5 @@ public class LogHighscores {
         } catch (IOException e) {
             logger.error("Fehler beim Schreiben in die Datei: " + filepath, e);
         }
-        */
     }
 }
diff --git a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java
index 540319c..dfb606a 100644
--- a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java
+++ b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java
@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-package de.hs_mannheim.informatik.mvn.gui; 
-
-=======
 package de.hs_mannheim.informatik.mvn.gui;
->>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Color;
@@ -23,12 +18,9 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 
-<<<<<<< HEAD
 import de.hs_mannheim.informatik.mvn.domain.HitoriMain;
 import de.hs_mannheim.informatik.mvn.domain.LogHighscores;
-=======
 import de.hs_mannheim.informatik.mvn.domain.*;
->>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
 
 public class GameGUI extends JFrame implements ActionListener {
 	
diff --git a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java
index 7765dde..16868d0 100644
--- a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java
+++ b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-package de.hs_mannheim.informatik.mvn.gui; 
-=======
+
 package de.hs_mannheim.informatik.mvn.gui;
->>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
@@ -20,11 +17,8 @@ import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-<<<<<<< HEAD
 import de.hs_mannheim.informatik.mvn.domain.HitoriMain;
-=======
 import de.hs_mannheim.informatik.mvn.domain.*;
->>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
 
 public class HighscoreGUI extends JFrame implements ActionListener {
 
diff --git a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java
index f814fb4..0fe874c 100644
--- a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java
+++ b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-package de.hs_mannheim.informatik.mvn.gui; 
-=======
+
 package de.hs_mannheim.informatik.mvn.gui;
->>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
@@ -17,11 +14,8 @@ import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-<<<<<<< HEAD
 import de.hs_mannheim.informatik.mvn.domain.HitoriMain;
-=======
 import de.hs_mannheim.informatik.mvn.domain.*;
->>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
 
 public class MenuGUI extends JFrame implements ActionListener {
 	
diff --git a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Highscores/Hitori4x4_leicht.txt b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Highscores/Hitori4x4_leicht.txt
index ce2c6b3..e69de29 100644
--- a/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Highscores/Hitori4x4_leicht.txt
+++ b/PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Highscores/Hitori4x4_leicht.txt
@@ -1,2 +0,0 @@
-emre
-berat
diff --git a/PR2Projekt/src/test/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java b/PR2Projekt/src/test/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java
index 39f5249..37ec773 100644
--- a/PR2Projekt/src/test/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java
+++ b/PR2Projekt/src/test/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java
@@ -57,7 +57,8 @@ class HitoriTest{
             {"W", "W", "W", "B"},
             {"W", "B", "W", "W"},
             {"B", "W", "W", "B"}};
-        String path = "C:/Users/Berat/Desktop/hitoriNew/src/main/java/de/hs_mannheim/informatik/mvn/Hitori_Highscores/Hitori4x4_leicht.txt";
+        String path = "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori4x4_leicht.csv";
+
 		try {
             assertFalse(HitoriMain2.abgabeMöglich(path, data, colors));
         } catch (FileNotFoundException e) {
@@ -77,7 +78,7 @@ class HitoriTest{
             {"W", "W", "W", "B"},
             {"W", "B", "W", "W"},
             {"B", "W", "W", "B"}};
-        String path = "C:/Users/Berat/Desktop/hitoriNew/src/main/java/de/hs_mannheim/informatik/mvn/Hitori_Spielfelder/Hitori4x4_leicht.csv";
+        String path = "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori4x4_leicht.csv";
 		try {
             assertTrue(HitoriMain2.abgabeMöglich(path, data, colors));
         } catch (FileNotFoundException e) {
@@ -99,7 +100,7 @@ class HitoriTest{
             {"W", "B", "W", "W", "W"},
             {"W", "B", "W", "W", "W"},
             {"W", "B", "W", "W", "W"}};
-        String path = "C:/Users/Berat/Desktop/hitoriNew/src/main/java/de/hs_mannheim/informatik/mvn/Hitori_Spielfelder/Hitori5x5_leicht.csv";
+        String path = "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori5x5leicht.csv";
 		try {
             assertFalse(HitoriMain2.abgabeMöglich(path, data, colors));
         } catch (FileNotFoundException e) {
@@ -121,7 +122,7 @@ class HitoriTest{
             {"B", "W", "W", "B", "W"},
             {"W", "W", "B", "W", "W"},
             {"B", "W", "W", "W", "B"}};
-        String path = "C:/Users/Berat/Desktop/hitoriNew/src/main/java/de/hs_mannheim/informatik/mvn/Hitori_Spielfelder/Hitori5x5_leicht.csv";
+        String path = "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori5x5leicht.csv";
 		try {
             assertTrue(HitoriMain2.abgabeMöglich(path, data, colors));
         } catch (FileNotFoundException e) {
diff --git a/PR2Projekt/src/test/java/java/de/hs_mannheim/informatik/mvn/test/resources/log4j2.xml b/PR2Projekt/src/test/java/de/hs_mannheim/informatik/mvn/test/log4j2.xml
similarity index 100%
rename from PR2Projekt/src/test/java/java/de/hs_mannheim/informatik/mvn/test/resources/log4j2.xml
rename to PR2Projekt/src/test/java/de/hs_mannheim/informatik/mvn/test/log4j2.xml