diff --git a/.github/workflows/release-image.yml b/.github/workflows/release-image.yml
index 9f35e92..89a46e4 100644
--- a/.github/workflows/release-image.yml
+++ b/.github/workflows/release-image.yml
@@ -36,11 +36,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
-<<<<<<< HEAD
-        uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
-=======
         uses: docker/build-push-action@v6
->>>>>>> 0eadb27 (update images)
         with:
           context: .
           push: true