Commit any conflicts during v1 backport to simplify release process#1

henrymercer merged 1 commit into

maindsp-testing/codeql-action-testing-2:mainfrom

henrymercer/handle-merge-conflicts-in-releasesdsp-testing/codeql-action-testing-2:henrymercer/handle-merge-conflicts-in-releasesCopy head branch name to clipboard