diff --git a/.gitea/workflows/quality.yml b/.gitea/workflows/quality.yml
index 2cc2ab5..18ac7d1 100644
--- a/.gitea/workflows/quality.yml
+++ b/.gitea/workflows/quality.yml
@@ -4,11 +4,7 @@ on:
       image:
         required: false
         type: string
-<<<<<<< HEAD
         default: git.qlic.nl/qlic/quality:php8.5
-=======
-        default: git.qlic.nl/qlic/quality:php8.4
->>>>>>> 3176fb49bb5370e8943f2f383bbfcc385a18d37a
       username:
         required: false
         type: string