diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/PairingListRegattaAdapter.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/PairingListRegattaAdapter.java
index 2f9406c9a76..b1720c64e3b 100644
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/PairingListRegattaAdapter.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/PairingListRegattaAdapter.java
@@ -1,15 +1,6 @@
 package com.sap.sailing.domain.base;
-
-<<<<<<< HEAD
-import com.sap.sse.pairinglist.CompetitionFormat;
+import com.sap.sse.pairinglist.CompetitionFormat; 
 
 public interface PairingListRegattaAdapter<Flight, Group, Competitor> extends CompetitionFormat<Flight, Group, Competitor> {
-=======
-import com.sap.sse.pairinglist.PairingFrameProvider;
 
-public interface PairingListRegattaAdapter<Flight, Group, Competitor> extends PairingFrameProvider {
->>>>>>> c6840c6f8abe1d8de70e395003205c11e79c2495
-
-    
-    
 }