diff --git a/.github/workflows/update_master.yml b/.github/workflows/update_master.yml
index 5b8b6837..44d7eea0 100644
--- a/.github/workflows/update_master.yml
+++ b/.github/workflows/update_master.yml
@@ -16,7 +16,7 @@ jobs:
         run: |
           git config user.name "cloudinary-jenkins"
           git config user.email "cloudinary-jenkins@clodinary.com"
-          git merge -X ours --no-edit origin/edge
+          git merge -X ours --no-edit origin/edge || true
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v6