merging Master with Ldap