diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 2b5ab22..4c8f9df 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -140,7 +140,6 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           path: ./dist
-
       - name: Publish release metadata to Version Agent
         shell: bash
         run: |
@@ -148,11 +147,17 @@ jobs:
           if [[ -z "${AGENT_URL:-}" || -z "${AGENT_TOKEN:-}" ]]; then
             echo "Missing AGENT_URL or AGENT_TOKEN" >&2; exit 1
           fi
+<<<<<<< HEAD
 
           VERSION="${TAG#v}"
           MAJOR="${VERSION%%.*}"
           BRANCH="${MAJOR}.x"
 
+=======
+          VERSION="${TAG#v}"                     # 12.3.1[-rc.1|-beta.1]
+          MAJOR="${VERSION%%.*}"                 # 12
+          BRANCH="${MAJOR}.x"                    # 12.x
+>>>>>>> e85857ccb4f14647cbcebe502da071b2ebe5d3fb
           CHANNEL="stable"
           [[ "$VERSION" == *"-rc"* ]] && CHANNEL="rc"
           [[ "$VERSION" == *"-beta"* ]] && CHANNEL="beta"