diff --git a/pom.xml b/pom.xml
index f347874a..2c3296b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,12 +54,8 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 				<version>3.11.0</version>
 				<configuration>
 					<compilerArgs>--enable-preview</compilerArgs>
-<<<<<<< HEAD
                     <source>20</source>
                     <target>20</target>
-=======
-                    <release>20</release>
->>>>>>> patternMatching
                 </configuration>
 			</plugin>
 			<plugin>
@@ -127,11 +123,6 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 		</repository>
 	</repositories>
 	<properties>
-<<<<<<< HEAD
-		<maven.compiler.source>20</maven.compiler.source>
-		<maven.compiler.target>20</maven.compiler.target>
-=======
->>>>>>> patternMatching
 		<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
 	</properties>
 	<distributionManagement>