diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 3cedeef52..fa2db52bf 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -166,12 +166,8 @@ static Class NSStringK;
       bindFields = nil;
       _scope = @"sub";
       _filter = nil;
-<<<<<<< variant A
 	  _userPasswordAlgorithm = nil;
->>>>>>> variant B
       listRequiresDot = YES;
-####### Ancestor
-======= end
 
       searchAttributes = nil;
       passwordPolicy = NO;