diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml
index 92d2f6e..6a11acb 100644
--- a/.gitea/workflows/tag_release.yaml
+++ b/.gitea/workflows/tag_release.yaml
@@ -9,11 +9,7 @@ on:
 
 jobs:
   release:
-<<<<<<< HEAD
     runs-on: ubuntu-24.04
-=======
-    runs-on: ubuntu-22.04
->>>>>>> f6fdb717e962116f790b33d960d6fde4abe17710
     steps:
       - name: Checkout code
         uses: actions/checkout@v3