fix: resolve conflicts

.gitea/workflows/create_update_pr.yml

@@ -6,16 +6,11 @@ permissions:
   pull-requests: write
 
 jobs:
-<<<<<<< before updating
-  test:
-    runs-on: ubuntu-latest
-=======
   create_update_branch_and_pr:
     runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
->>>>>>> after updating
 
     steps:
       - name: Setup Python
@@ -25,25 +20,13 @@ jobs:
     
       - name: Install tools
         run: |
-<<<<<<< before updating
-          pip install copier
-=======
           pip install copier PySide6
->>>>>>> after updating
 
       - name: Checkout
         uses: actions/checkout@v4
     
       - name: Perform update
         run: |
-<<<<<<< before updating
-          branch="chore/update-template-$(python -m uuid)"
-          git checkout -b $branch
-          msg = $(copier update --trust --defaults --conflict inline 2>&1 | sed -n 1p)
-          git add -A
-          git diff-index --quiet HEAD || git commit -a -m $msg
-          git push -u origin $branch
-=======
           git config --global user.email "bec_ci_staging@psi.ch"
           git config --global user.name "BEC automated CI"
 
@@ -77,4 +60,3 @@ jobs:
                   \"head\": \"$(echo $branch)\",
                   \"base\": \"main\"
                 }"
->>>>>>> after updating