diff --git a/.github/actions/asana-create-action-item/templates/merge-failed.yml b/.github/actions/asana-create-action-item/templates/merge-failed.yml
index f4d997e98b..db6e4c8aa7 100644
--- a/.github/actions/asana-create-action-item/templates/merge-failed.yml
+++ b/.github/actions/asana-create-action-item/templates/merge-failed.yml
@@ -16,7 +16,12 @@ data:
         <li><code>git pull origin ${BASE_BRANCH}</code> pull the latest code</li>
         <li><code>git merge ${BRANCH}</code>
           <ul>
-            <li>resolve conflicts as needed</li>
+            <li>Resolve conflicts as needed</li>
+            <li>When merging a hotfix branch into an internal release branch, you will get conflicts in version and build number xcconfig files:
+              <ul>
+                <li>In the version file: accept the internal version number (higher).</li>
+                <li>In the build number file: accept the hotfix build number (higher). This step is very important in order to calculate the build number of the next internal release correctly.</li>
+              </ul></li>
           </ul></li>
         <li><code>git push origin ${BASE_BRANCH}</code> push merged branch</li>
       </ul>
diff --git a/.github/workflows/tag_release.yml b/.github/workflows/tag_release.yml
index 3f7539f16a..02d8d45dec 100644
--- a/.github/workflows/tag_release.yml
+++ b/.github/workflows/tag_release.yml
@@ -133,7 +133,7 @@ jobs:
         fi
 
     - name: Set up Asana templates
-      if: failure() || ${{ env.MERGE_OR_DELETE_FAILED }}
+      if: failure() || env.MERGE_OR_DELETE_FAILED == 'true'
       id: asana-failure-templates
       run: |
         if [[ ${{ steps.create-tag.outputs.tag-created }} == "true" ]]; then
@@ -156,7 +156,7 @@ jobs:
 
     - name: Create Asana task on failure
       id: create-task-on-failure
-      if: failure() || ${{ env.MERGE_OR_DELETE_FAILED }}
+      if: failure() || env.MERGE_OR_DELETE_FAILED == 'true'
       uses: ./.github/actions/asana-create-action-item
       with:
         access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
@@ -164,7 +164,7 @@ jobs:
         template-name: ${{ steps.asana-failure-templates.outputs.task-template }}
 
     - name: Report failure
-      if: failure() || ${{ env.MERGE_OR_DELETE_FAILED }}
+      if: failure() || env.MERGE_OR_DELETE_FAILED == 'true'
       uses: ./.github/actions/asana-log-message
       env:
         ASSIGNEE_ID: ${{ steps.create-task-on-failure.outputs.assignee-id }}
@@ -175,7 +175,7 @@ jobs:
         template-name: ${{ steps.asana-failure-templates.outputs.comment-template }}
 
     - name: Set up Asana success comment template
-      if: success() && ${{ env.MERGE_OR_DELETE_FAILED == 'false' }}
+      if: ${{ env.MERGE_OR_DELETE_FAILED == 'false' }}
       id: asana-success-template
       run: |
         if [[ "${prerelease}" == "true" ]]; then
@@ -185,7 +185,7 @@ jobs:
         fi
 
     - name: Report success
-      if: success() && ${{ env.MERGE_OR_DELETE_FAILED == 'false' }}
+      if: ${{ env.MERGE_OR_DELETE_FAILED == 'false' }}
       uses: ./.github/actions/asana-log-message
       with:
         access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}