diff --git a/uncloud/uncloud/settings.py b/uncloud/uncloud/settings.py
index b2fc7ef..5ce8e92 100644
--- a/uncloud/uncloud/settings.py
+++ b/uncloud/uncloud/settings.py
@@ -111,14 +111,7 @@ AUTH_PASSWORD_VALIDATORS = [
 ################################################################################
 # AUTH/LDAP
 
-<<<<<<< HEAD
-import ldap
-from django_auth_ldap.config import LDAPSearch
-
 AUTH_LDAP_SERVER_URI = uncloud.secrets.LDAP_SERVER_URI
-=======
-AUTH_LDAP_SERVER_URI = "ldaps://ldap1.ungleich.ch,ldaps://ldap2.ungleich.ch"
->>>>>>> ahmed/master
 
 AUTH_LDAP_USER_ATTR_MAP = {
     "first_name": "givenName",
@@ -126,15 +119,10 @@ AUTH_LDAP_USER_ATTR_MAP = {
     "email": "mail"
 }
 
-<<<<<<< HEAD
+
 AUTH_LDAP_BIND_DN = uncloud.secrets.LDAP_ADMIN_DN
 AUTH_LDAP_BIND_PASSWORD = uncloud.secrets.LDAP_ADMIN_PASSWORD
-=======
-AUTH_LDAP_BIND_DN = secrets.AUTH_LDAP_BIND_DN
 
-AUTH_LDAP_BIND_PASSWORD = secrets.AUTH_LDAP_BIND_PASSWORD
-
->>>>>>> ahmed/master
 AUTH_LDAP_USER_SEARCH = LDAPSearch(
     "dc=ungleich,dc=ch", ldap.SCOPE_SUBTREE, "(uid=%(user)s)"
 )