fixing validation issues

Author: Jak-MS

articles/cost-management-billing/manage/ea-portal-administration.md

@@ -16,7 +16,7 @@ This article explains the common tasks that an administrator accomplishes in the
 
 ## Add a new enterprise administrator
 
-Enterprise administrators have the most privileges when managing an Azure EA enrollment. The initial Azure EA admin was created when the EA agreement was set up. However, you can add or remove new admins at any time. New admins are only added by existing admins. For more information about adding  additional enterprise admins, see [Create another enterprise admin](ea-portal-get-started.md#create-another-enterprise-admin). For more information about billing profile roles and tasks, see [Billing profile roles and tasks](understand-mca-roles.md#billing-profile-roles-and-tasks).
+Enterprise administrators have the most privileges when managing an Azure EA enrollment. The initial Azure EA admin was created when the EA agreement was set up. However, you can add or remove new admins at any time. New admins are only added by existing admins. For more information about adding  additional enterprise admins, see [Create another enterprise admin](ea-portal-get-started.md#create-another-enterprise-administrator). For more information about billing profile roles and tasks, see [Billing profile roles and tasks](understand-mca-roles.md#billing-profile-roles-and-tasks).
 
 ## Update user state from pending to active
 
@@ -26,7 +26,7 @@ When new Account Owners (AO) are added to an Azure EA enrollment for the first t
 
 After an Azure EA admin creates a department, the Azure Enterprise administrator can add department administrators and associate each one to a department. A department administrator can create new accounts. New accounts are needed for Azure EA subscriptions to get created.
 
-For more information about adding a department admin, see [Create an Azure EA department admin](ea-portal-get-started.md#add-a-department-admin).
+For more information about adding a department admin, see [Create an Azure EA department admin](ea-portal-get-started.md#add-a-department-administrator).
 
 ## Associate an account to a department
 

articles/cost-management-billing/manage/ea-portal-enrollment-invoices.md

@@ -626,7 +626,7 @@ See [Power BI self-service sign up](https://powerbi.microsoft.com/documentation/
 > [!TIP]
 > 
 > - To learn how to generate the API key for your enrollment, see the API Reports help file on the [Enterprise portal](https://ea.azure.com/?WT.mc_id=azurebg_email_Trans_33675_1378_Service_Notice_EA_Customer_Power_BI_EA_Content_Pack_Apr26).
-> - For more information about connecting Power BI to  to your Azure consumption, see [Microsoft Azure Consumption Insights](https://docs.microsoft.com/en-us/power-bi/desktop-connect-azure-consumption-insights).
+> - For more information about connecting Power BI to  to your Azure consumption, see [Microsoft Azure Consumption Insights](https://docs.microsoft.com/power-bi/desktop-connect-azure-consumption-insights).
 
 ### To access the legacy Power BI EA content pack:
 
@@ -713,17 +713,13 @@ The resource rate is derived based on your charges. It might not match the actua
 In the download usage data report, you can see raw resource usage up to six decimal places. This data is used for overage charge calculations. However, usage data shown in the Azure Enterprise portal is rounded to four decimal places for commitment units and truncated to zero decimals for overage units. Under the Azure Enterprise portal, all overage usage is charged for full units only. You might see a large difference between the unit price and the resource rate for usage that is charged as overage or in mixed months.
 
 ## Next steps
-<<<<<<< HEAD:articles/billing/billing-ea-portal-enrollment-invoices.md
 
 - The following Excel files provide details on Azure services and are updated on the 6th and 20th of every month:
 
    | Title | Description | File name |
    | --- | --- | --- |
    | [Friendly Service Names](https://azurepricing.blob.core.windows.net/supplemental/Friendly_Service_Names.xlsx) | Lists all active services and includes: <br>  <ul><li> service category</li>   <li>friendly service name</li>   <li>commitment name and part number</li>consumption name and part number</li>   <li>units of measure</li>   <li>conversion factors between reported usage and displayed Enterprise portal usage</li></ul> | Friendly\_Service\_Names.xlsx |
    | [Service Download Fields](https://azurepricing.blob.core.windows.net/supplemental/Service_Download_Fields.xlsx) | This spreadsheet provides a listing of all possible combinations of the service-related fields in the Usage Download Report. | Service\_Download\_Fields.xlsx |
-- For more information about your invoice and charges, see [Understand your Azure Enterprise Agreement bill](billing-understand-your-bill-ea.md).
-- View instructions on how to [Get started with the Azure Enterprise portal](billing-ea-portal-get-started.md).
-=======
+
 - For information about understanding your invoice and charges, see [Understand your Azure Enterprise Agreement bill](../understand/review-enterprise-agreement-bill.md).
-- To start using the Azure EA portal, see [Get started with the Azure EA portal](ea-portal-get-started.md).
->>>>>>> 4700a4d22788800da6af065910beca716f13d28e:articles/cost-management-billing/manage/ea-portal-enrollment-invoices.md
+- To start using the Azure Enterprise portal, see [Get started with the Azure EA portal](ea-portal-get-started.md).

articles/cost-management-billing/manage/ea-portal-get-started.md

@@ -93,11 +93,7 @@ Users with this role can:
 - Manage service administrators
 - View usage for subscriptions
 
-<<<<<<< HEAD:articles/billing/billing-ea-portal-get-started.md
-Each account requires a unique work, school, or Microsoft account. For more information about Azure Enterprise portal administrative roles, see [Understand Azure Enterprise Agreement administrative roles in Azure](billing-understand-ea-roles.md).
-=======
-Each account requires a unique Work, School, or Microsoft Account. For more information about Azure EA Portal administrative roles, see [Understand Azure Enterprise Agreement administrative roles in Azure](understand-ea-roles.md).
->>>>>>> 4700a4d22788800da6af065910beca716f13d28e:articles/cost-management-billing/manage/ea-portal-get-started.md
+Each account requires a unique work, school, or Microsoft account. For more information about Azure Enterprise portal administrative roles, see [Understand Azure Enterprise Agreement administrative roles in Azure](understand-ea-roles.md).
 
 ### Service administrator
 
@@ -380,28 +376,14 @@ To view detailed usage for specific accounts, download the Usage Detail report:
 
 To view the usage summary reports and graphs:
 
-<<<<<<< HEAD:articles/billing/billing-ea-portal-get-started.md
 1. Sign in to the Azure Enterprise portal.
-1. In the left navigation pane, select **Reports** and view the **Usage Summary** tab.  
-  ![Create and view usage summary and download reports](./media/billing-ea-portal-get-started/create-ea-view-usage-summary-and-download-reports.png)
+
 1. Select a commitment term.
 
    To change the date range for **Usage Summary**, you can toggle from **M** (Monthly) to **C** (Custom) on the top right of the page and then enter custom start and end dates.
 
-   ![Create and view usage summary and download reports in custom view](./media/billing-ea-portal-get-started/create-ea-view-usage-summary-and-download-reports-custom-view.png)
+   ![Create and view usage summary and download reports in custom view](./media/ea-portal-get-started/create-ea-view-usage-summary-and-download-reports-custom-view.png)
 1. To view additional details, you can select a period or month on the graph.
-=======
-1. In the Azure EA portal, in the left navigation area, click **Reports** and view the **Usage Summary** tab.  
-  ![Create and view usage summary and download reports](./media/ea-portal-get-started/create-ea-view-usage-summary-and-download-reports.png)
-2. Select a commitment term.
-3. Toggle between **M** (Monthly) and **C** (Custom) on the top right of the page to view the **Usage Summary** with custom start and end dates.  
-  ![Create and view usage summary and download reports in custom view](./media/ea-portal-get-started/create-ea-view-usage-summary-and-download-reports-custom-view.png)
-4. Select a period or month on the graph to view additional details.
-5. The graph shows month over month usage with a breakdown of utilized usage, service overcharge, charges billed separately, and marketplace charges.
-6. For the selected month, filter by departments, accounts, and subscriptions below the graph.
-7. Toggle between **Charge by Services** and **Charge by Hierarchy**.
-8. Expand and collapse between **Azure Service**, **Charges Billed Separately**, and **Azure Marketplace** to view details.
->>>>>>> 4700a4d22788800da6af065910beca716f13d28e:articles/cost-management-billing/manage/ea-portal-get-started.md
 
    - The graph shows month-over-month usage with a breakdown of utilized usage, service overcharge, charges billed separately, and marketplace charges.
    - For the selected month, you can use the fields below the graph to filter by departments, accounts, and subscriptions.
@@ -604,12 +586,6 @@ Power BI reporting is available for Azure EA direct, partner, and indirect custo
 
 ## Next steps
 
-<<<<<<< HEAD:articles/billing/billing-ea-portal-get-started.md
-- Azure Enterprise portal administrators should read [Azure Enterprise portal administration](billing-ea-portal-administration.md) to learn about common administrative tasks.
-- If you need help with troubleshooting Azure Enterprise portal issues, see [Troubleshoot Azure Enterprise portal access](billing-ea-portal-troubleshoot.md).
+- Azure Enterprise portal administrators should read [Azure Enterprise portal administration](ea-portal-administration.md) to learn about common administrative tasks.
+- If you need help with troubleshooting Azure Enterprise portal issues, see [Troubleshoot Azure Enterprise portal access](ea-portal-troubleshoot.md).
 - For an Azure EA onboarding guide, see [Azure EA Onboarding Guide (PDF)](https://ea.azure.com/api/v3Help/v2AzureEAOnboardingGuide).
-=======
-- Azure EA portal administrators should read [Azure EA portal administration](ea-portal-administration.md) to learn about common administrative tasks.
-- If you need help with troubleshooting Azure EA portal issues, see [Troubleshoot Azure EA portal access](ea-portal-troubleshoot.md).
-- For an Azure EA onboarding guide, see [Azure EA Onboarding Guide](https://ea.azure.com/api/v3Help/v2AzureEAOnboardingGuide).
->>>>>>> 4700a4d22788800da6af065910beca716f13d28e:articles/cost-management-billing/manage/ea-portal-get-started.md