diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 4c8f9df..0a337cb 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -147,17 +147,11 @@ 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"