Minor fixes on release notes texts

Author: GitHub Actions

modules/release-notes/ref-release-notes-new-features.adoc

@@ -42,11 +42,7 @@ Identify the flavor of Backstage that is running. Default value: `rhdh`
 
 
 [id="feature-rhidp-4419"]
-<<<<<<< HEAD
-== Ability to manage Persistent Volume Claim (PVCs) in {product-very-short} Operator
-=======
 == Ability to manage Persistent Volume Claim (PVCs) in RHDH Operator
->>>>>>> 9733ff430 (Minor fixes on the release notes texts)
 
 You can now mount directories from pre-created PersistentVolumeClaims (PVCs) using the `spec.application.extraFiles.pvcs` field, while configuring RHDH Operator.
 For more information, see link:https://docs.redhat.com/en/documentation/red_hat_developer_hub/{product-version}/html-single/configuring/index#configuring-the-deployment[Configuring {product} deployment when using the Operator].