diff --git a/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java b/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java
index e3866217d..b1ee26d6b 100755
--- a/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java
+++ b/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java
@@ -28,8 +28,4 @@ import com.arsdigita.domain.DomainServiceInterfaceExposer;
  */
 public class DefaultDomainService extends DomainServiceInterfaceExposer {
 
-<<<<<<< .mine
-=======
-
->>>>>>> .r389
 }