diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..1b49b07e
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+  "editor.detectIndentation": false,
+  "editor.tabSize": 4
+}
\ No newline at end of file
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 5a098bbf..71767d08 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -7,7 +7,11 @@ cp -n cotisations/templates/cotisations/voucher.html templates/default_voucher.h
 AUTOMIGRATE=${AUTOMIGRATE:-yes}
 
 if [ "$AUTOMIGRATE" != "skip" ]; then
+<<<<<<< HEAD
   poetry run python manage.py migrate --noinput
+=======
+  poetry run python3 manage.py migrate --noinput
+>>>>>>> a62566ef (premier essai)
 fi
 
 poetry run python manage.py collectstatic
diff --git a/ldap_sync/migrations/0002_delete.py b/ldap_sync/migrations/0002_delete.py
new file mode 100644
index 00000000..bbcf2cce
--- /dev/null
+++ b/ldap_sync/migrations/0002_delete.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2021-01-10 16:59
+from __future__ import unicode_literals
+
+from django.db import migrations
+#from django.conf import settings
+import ldapdb.models.fields
+
+#from ldap_sync.management.commands.ldap_rebuild import flush_ldap, sync_ldap
+
+#def rebuild_ldap(apps, schema_editor):
+#    usersdn = settings.LDAP["base_user_dn"]
+#    groupsdn = settings.LDAP["base_usergroup_dn"]
+#    binddn = settings.DATABASES["ldap"]["USER"]
+#    bindpass = settings.DATABASES["ldap"]["PASSWORD"]
+#    server = settings.DATABASES["ldap"]["NAME"]
+#    flush_ldap(binddn, bindpass, server, usersdn, groupsdn)
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('ldap_sync', '0001_initial')
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='LdapServiceUser',
+        ),
+        migrations.DeleteModel(
+            name='LdapServiceUserGroup',
+        ),
+        migrations.DeleteModel(
+            name='LdapUser',
+        ),
+        migrations.DeleteModel(
+            name='LdapUserGroup',
+        ),
+    ]
diff --git a/poetry.lock b/poetry.lock
index f0704164..e32b76d2 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -2165,4 +2165,8 @@ postgresql = ["psycopg2"]
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.8,<4.0"
+<<<<<<< HEAD
 content-hash = "35c7fcf4285d44bb7287cb8d9573f327beec53c61979faae77a8c077c2560930"
+=======
+content-hash = "2ee7b73659d0ea743ca62e05d7dd39be39a3f8cbb61688aa0e58bd728c3e21ce"
+>>>>>>> db0c57af (premier essai)