diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index f52e8220..1937108d 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -28,8 +28,13 @@ if [ "$AUTOMIGRATE" != "skip" ]; then
 >>>>>>> a62566ef (premier essai)
 fi
 
+<<<<<<< HEAD
 poetry run python manage.py collectstatic
 poetry run python manage.py compilemessages
+=======
+poetry run python3 manage.py collectstatic
+poetry run python3 manage.py compilemessages
+>>>>>>> a58d4dca (update pip requirements)
 
 cat <<EOF | poetry run python manage.py shell
 from django.contrib.auth import get_user_model
diff --git a/pip_dev_requirements.txt b/pip_dev_requirements.txt
deleted file mode 100644
index cabe8473..00000000
--- a/pip_dev_requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r pip_requirements.txt
-volatildap
diff --git a/pip_requirements.txt b/pip_requirements.txt
deleted file mode 100644
index b0ceffe5..00000000
--- a/pip_requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-django-bootstrap3==11.1.0
-django-macaddress==1.6.0
-django-autocomplete-light==3.8.1