commit 1 from ldap
commit 1 from google
Attempted to resolve conflict
first attempt to merge conflict