Fixed merge in LDAP conflict