diff --git a/.project b/.project
index 146e287..36c8a04 100644
--- a/.project
+++ b/.project
@@ -16,7 +16,11 @@
 	</natures>
 	<filteredResources>
 		<filter>
+<<<<<<< HEAD
 			<id>1669476271551</id>
+=======
+			<id>1669479668624</id>
+>>>>>>> 3ce9c552765558c513783ea39e3fb8769742fd55
 			<name></name>
 			<type>30</type>
 			<matcher>
diff --git a/src/domain/BotEasyFuchs.java b/src/domain/BotEasyFuchs.java
index e429c95..7154d20 100644
--- a/src/domain/BotEasyFuchs.java
+++ b/src/domain/BotEasyFuchs.java
@@ -7,7 +7,11 @@ public class BotEasyFuchs extends Bot {
 	}
 
 	@Override
-	public String zugBestimmen() {	
+<<<<<<< HEAD
+	public String zugBestimmen() {
+=======
+	public String zugBestimmen() {
+>>>>>>> 3ce9c552765558c513783ea39e3fb8769742fd55
 		return "Ich bins der Einfache Fuchs Bot";
 	}