Exempted - Resolved merge conflicts

Author: pvkrishnachaitanya

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 6.26.0 (Unreleased)
+## 6.26.0 (February 12, 2025)
 
 ### Added
 - Support for Organizations

examples/README.md

@@ -235,6 +235,8 @@ This directory contains Terraform configuration files showing how to create spec
     [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/storage.zip)
 - streaming  
     [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/streaming.zip)
+- tenantmanagercontrolplane  
+    [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/tenantmanagercontrolplane.zip)
 - usage_proxy  
     [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/usage_proxy.zip)
 - vault_secret  

examples/tenantmanagercontrolplane/README.md

@@ -0,0 +1,6 @@
+# Overview 
+This is a Terraform configuration that creates the `tenantmanagercontrolplane` service on Oracle Cloud Infrastructure. 
+
+The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources.
+## Magic Button 
+[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/tenantmanagercontrolplane.zip)

examples/tenantmanagercontrolplane/description.md

@@ -0,0 +1,4 @@
+# Overview 
+This is a Terraform configuration that creates the `tenantmanagercontrolplane` service on Oracle Cloud Infrastructure. 
+
+The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources.