diff --git a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java
index 38660838..2f2c7fd3 100644
--- a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java
+++ b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java
@@ -1,9 +1,5 @@
 package org.mustangproject.ZUGFeRD;
 
 public enum ZUGFeRDConformanceLevel {
-<<<<<<< HEAD
     BASIC, COMFORT, EXTENDED;
-=======
-    BASIC, COMFORT, EXTENDED
->>>>>>> a6c972eb3cdfdebf0374a2e87a48bd14b463ff78
 }