merge local conflict
merge local conflict
# [LDAP] komea don't crasj if LDAP URL is not set
* merge and resolve conflocts