fix merge conflicts

Author: adwk67

.github/ISSUE_TEMPLATE/new_version.md

@@ -32,5 +32,4 @@ Part of <https://github.com/stackabletech/issues/issues/TRACKING_ISSUE>
 ### Bump Rust Dependencies
 
 - [ ] Bump `stackable-operator` and friends
-- [ ] Bump `product-config`
 - [ ] Bump all other dependencies

.github/ISSUE_TEMPLATE/normal-issue.md

@@ -20,5 +20,10 @@ jobs:
         with:
           persist-credentials: false
       - uses: rustsec/audit-check@69366f33c96575abad1ee0dba8212993eecbe998 # v2.0.0
+        # Build against stable because cargo-audit sometimes depends on things
+        # that require a newer Rust version than our pinned toolchain. This does
+        # not influence the result, so it should be safe.
+        env:
+          RUSTUP_TOOLCHAIN: stable
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Changed
+
+- Internal operator refactoring: introduce a build() step in the reconciler that
+  assembles all relevant Kubernetes resources before anything is applied ([#961]).
+- Bump stackable-operator to 0.114.0 ([#970])
+
+[#961]: https://github.com/stackabletech/nifi-operator/pull/961
+[#970]: https://github.com/stackabletech/nifi-operator/pull/970
+
+## [26.7.0] - 2026-07-21
+
+## [26.7.0-rc1] - 2026-07-16
+
 ### Added
 
 - BREAKING: Add required CLI argument and env var to set the image repository used to construct final product image names: `IMAGE_REPOSITORY` (`--image-repository`), eg. `oci.example.org/my/namespace` ([#928]).