diff --git a/poetry.lock b/poetry.lock
index e32b76d2..02579a1b 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -2166,7 +2166,11 @@ postgresql = ["psycopg2"]
 lock-version = "2.0"
 python-versions = ">=3.8,<4.0"
 <<<<<<< HEAD
+<<<<<<< HEAD
 content-hash = "35c7fcf4285d44bb7287cb8d9573f327beec53c61979faae77a8c077c2560930"
 =======
 content-hash = "2ee7b73659d0ea743ca62e05d7dd39be39a3f8cbb61688aa0e58bd728c3e21ce"
 >>>>>>> db0c57af (premier essai)
+=======
+content-hash = "638f084a0a517296e8a9f376d2f5b1495db4b951da0f608d7d96d91ad088cf08"
+>>>>>>> fb5f4ad3 (lock)