diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index 2bfdbff..5bd15be 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -208,6 +208,7 @@ jobs:
             IFS='.' read -r -a VERSION_ARRAY <<< "${VERSION:1}"
 
             echo "new-release-published=${{ steps.release.outputs.new-release-published }}" >> $GITHUB_OUTPUT
+<<<<<<< HEAD
             echo "release-version=${VERSION}" >> $GITHUB_OUTPUT
             echo "release-major=${VERSION_ARRAY[0]}" >> $GITHUB_OUTPUT
             echo "release-minor=${VERSION_ARRAY[1]}" >> $GITHUB_OUTPUT
@@ -217,6 +218,15 @@ jobs:
             echo "${{ steps.release.outputs.release-notes }}" >> $GITHUB_OUTPUT
             echo "EOF" >> $GITHUB_OUTPUT
 
+=======
+            echo "release-version=${VERSION:1}" >> $GITHUB_OUTPUT
+            echo "release-major=${VERSION_ARRAY[0]}" >> $GITHUB_OUTPUT
+            echo "release-minor=${VERSION_ARRAY[1]}" >> $GITHUB_OUTPUT
+            echo "release-patch=${VERSION_ARRAY[2]}" >> $GITHUB_OUTPUT
+            echo "release-notes<<EOF" >> $GITHUB_OUTPUT
+            echo ${{ steps.release.outputs.release-notes }} >> $GITHUB_OUTPUT
+            echo "EOF" >> $GITHUB_OUTPUT
+>>>>>>> ec2b44a (feat: always output version)
             echo "type=${{ steps.release.outputs.type }}" >> $GITHUB_OUTPUT
             echo "channel=${{ steps.release.outputs.channel }}" >> $GITHUB_OUTPUT
             echo "git-head=${{ steps.release.outputs.git-head }}" >> $GITHUB_OUTPUT
@@ -228,11 +238,17 @@ jobs:
             echo "release-major=${{ steps.release.outputs.release-major }}" >> $GITHUB_OUTPUT
             echo "release-minor=${{ steps.release.outputs.release-minor }}" >> $GITHUB_OUTPUT
             echo "release-patch=${{ steps.release.outputs.release-patch }}" >> $GITHUB_OUTPUT
+<<<<<<< HEAD
 
             echo "release-notes<<EOF" >> $GITHUB_OUTPUT
             echo "${{ steps.release.outputs.release-notes }}" >> $GITHUB_OUTPUT
             echo "EOF" >> $GITHUB_OUTPUT
             
+=======
+            echo "release-notes<<EOF" >> $GITHUB_OUTPUT
+            echo ${{ steps.release.outputs.release-notes }} >> $GITHUB_OUTPUT
+            echo "EOF" >> $GITHUB_OUTPUT
+>>>>>>> ec2b44a (feat: always output version)
             echo "type=${{ steps.release.outputs.type }}" >> $GITHUB_OUTPUT
             echo "channel=${{ steps.release.outputs.channel }}" >> $GITHUB_OUTPUT
             echo "git-head=${{ steps.release.outputs.git-head }}" >> $GITHUB_OUTPUT