diff --git a/dockers/paheko/Dockerfile b/dockers/paheko/Dockerfile
index f93e97a..7daddf1 100644
--- a/dockers/paheko/Dockerfile
+++ b/dockers/paheko/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM paheko/paheko:1.3.18-php8.4
-=======
 FROM paheko/paheko:1.3.18-PHP8.4
->>>>>>> 71aa2dc (paheko 1.3.18 php8.4 et factu 0.16)
 
 ENV PAHEKO_DIR /var/www/paheko