Add strategy to release ci

.github/workflows/release.yml

@@ -216,7 +216,7 @@ jobs:
           git fetch
           git checkout develop
           git pull origin
-          git merge main
+          git merge main --strategy-option ours
           git push origin develop
   notify:
     runs-on: ubuntu-22.04