diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 010f762..dae181a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,11 +16,7 @@ permissions:
 
 jobs:
   release:
-<<<<<<< HEAD
     uses: sous-chefs/.github/.github/workflows/release-cookbook.yml@8.0.2
-=======
-    uses: sous-chefs/.github/.github/workflows/release-cookbook.yml@8.0.2
->>>>>>> 8a5769f (ci: bump release workflow to 6.0.0)
     secrets:
       token: ${{ secrets.PORTER_GITHUB_TOKEN }}
       supermarket_user: ${{ secrets.CHEF_SUPERMARKET_USER }}