diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml
index d5e3fd0..0b39064 100644
--- a/.github/workflows/_docker-build.yml
+++ b/.github/workflows/_docker-build.yml
@@ -266,14 +266,6 @@ jobs:
           set: ${{ inputs.set }}
           provenance: false
           sbom: false
-<<<<<<< Updated upstream
-          set: ${{ inputs.set }}
-        env:
-          registries: ${{ inputs.registries }}
-=======
-        env:
-          registries: ${{ steps.list-registries.outputs.registries }}
->>>>>>> Stashed changes
 
       - name: Export metadata
         id: export