solve merge conflict

Author: alexravenna

includes/key-vault-quickstart-rbac.md

@@ -2,7 +2,7 @@
 author: msmbaldwin
 ms.service: key-vault
 ms.topic: include
-ms.date: 04/04/2024
+ms.date: 06/12/2024
 ms.author: msmbaldwin
 
 # Used by articles that show how to assign a Key Vault access policy
@@ -27,4 +27,4 @@ New-AzRoleAssignment -ObjectId "<app-id>" -RoleDefinitionName "Key Vault Secrets
 
 ---
 
-Replace `<app-id>`, `<subscription-id>`, `<resource-group-name>` and `<your-unique-keyvault-name>` with your actual values. `<app-id>` is the Application (client) ID of your registered application in Azure AD.
+Replace `<app-id>`, `<subscription-id>`, `<resource-group-name>` and `<your-unique-keyvault-name>` with your actual values. `<app-id>` is the Application (client) ID of your registered application in Microsoft Entra.