fixed merge conflicts

Author: himeshsiriwardana

en/asgardeo/docs/references/data-residency-in-asgardeo.md

@@ -49,16 +49,8 @@ You can onboard to Asgardeo in your preferred region by using the relevant URL (
 - **Asgardeo Console - US region**: https://console.asgardeo.io/
 - **Asgardeo Console - EU region**: https://console.eu.asgardeo.io/
 
-<<<<<<< pr-5394
-
 Effective June 27, 2025, all applicable user and service-related data are stored in the selected regional data center (US or EU), replacing the previous approach of storing some data types only in the US.
 
-=======
-!!! note "Update"
-
-    Prior to June 27th, 2025, certain types of data were always stored exclusively in the US data center. However, with the recent update, those data types are now stored in the regional data center selected during onboarding.
->>>>>>> update-asgardeo-data-recidency
-
 ### Subscription data
 
 Your subscription account is the user account that's created when you are onboarded to Asgardeo. Billing details are linked to this account. Listed below are some of the subscription data:
@@ -67,31 +59,19 @@ Your subscription account is the user account that's created when you are onboar
 - Subscription ID
 - Tier details
 
-<<<<<<< pr-5394
 !!! warning "Update"
 
     Effective June 27, 2025, subscription data is stored in the regional data center (US or EU) selected during onboarding, replacing the previous approach of storing it exclusively in the US.
-=======
-!!! note "Update"
-
-    Prior to June 27th, 2025, all subscription data was stored exclusively in the US datacenter. We are now introducing regional storage for subscription data. This means your subscription data will reside in the same regional datacenter (US or EU) that you select during onboarding.
->>>>>>> update-asgardeo-data-recidency
 
 ### Administrator data
 
 Users onboarded to Asgardeo as [organization administrators]({{base_path}}/guides/users/manage-administrators/) are granted access to the global WSO2 services such as billing and support. Therefore, the administrator data (including profile information and login information from the billing/support portals) was previously stored exclusively in the US datacenter.
 
 The profile information of organization administrators includes all the data that organization administrators enter in their user profiles.
 
-<<<<<<< pr-5394
 !!! warning "Update"
 
     Effective June 27, 2025, administrator data is stored in the selected regional data center (US or EU), replacing the previous approach of storing it exclusively in the US.
-=======
-!!! note "Update"
-
-    Previously, administrator data was stored only in the US data center. Starting June 27th, 2025, it will be stored in the regional data center selected during onboarding (US or EU).
->>>>>>> update-asgardeo-data-recidency
 
 ### End-user data
 

en/asgardeo/docs/references/operational-policies.md

@@ -74,13 +74,7 @@ You can onboard to Asgardeo in your preferred region by using the relevant URL b
 - Asgardeo Console - US region: [https://console.asgardeo.io/](https://console.asgardeo.io/){target="_blank"}
 - Asgardeo Console - EU region: [https://console.eu.asgardeo.io/](https://console.eu.asgardeo.io/){target="_blank"}
 
-<<<<<<< pr-5394
-Previously, certain types of data were always stored exclusively in the US data center. However, with the recent update, those data types are now stored in the regional data center selected during onboarding. See section 3.3 for more details.
-=======
-!!! note "Update"
-
-    As of June 27, 2025, certain types of data were always stored exclusively in the US data center. However, with the recent update, those data types are now stored in the regional data center selected during onboarding. See section 3.3 for more details.
->>>>>>> update-asgardeo-data-recidency
+Effective June 27, 2025, all types of are stored in the selected regional data center (US or EU), replacing the previous approach of storing some data types only in the US. See section 3.3 for more details.
 
 ### 3.3 Data types
 
@@ -93,7 +87,6 @@ When you onboard to Asgardeo, the user account created will automatically functi
 - Subscription ID
 - Tier details
 
-<<<<<<< pr-5394
 !!! warning "Update"
 
     Effective June 27, 2025, subscription data is stored in the regional data center (US or EU) you select during onboarding. Previously, all subscription data was stored exclusively in the US.
@@ -103,15 +96,6 @@ When you onboard to Asgardeo, the user account created will automatically functi
 Administrator data includes any information that organization administrators enter in their user profiles, and also the login information used to access global WSO2 services such as billing and support. Users who onboard to Asgardeo as organization administrators are automatically granted access to these services.
 
 !!! warning "Update"
-=======
-!!! note "Update"
-
-    As of June 27th, 2025, subscription data is stored in the regional data center selected during onboarding (US or EU), marking a shift from the previous approach where all such data was exclusively stored in the US.
-
-#### 3.3.2 Administrator data
-
-Users onboarded to Asgardeo as organization administrators are granted access to the global WSO2 services such as billing and support. Therefore, the administrator data (including profile information and login information from the billing/support portals) was previously stored exclusively in the US datacenter.
->>>>>>> update-asgardeo-data-recidency
 
     Effective June 27, 2025, administrator data is stored in the selected regional data center (US or EU), replacing the previous approach of storing it exclusively in the US.