warning fixes

Author: ErikjeMS

windows-365/enterprise/create-azure-network-connection.md

@@ -48,7 +48,7 @@ To create an ANC, you must:
 - Have [Owner permissions on the Azure subscription](/azure/cost-management-billing/manage/add-change-subscription-administrator) that contains the virtual network with connectivity to your on-premises domain controller and network.
 - Make sure that your PowerShell execution policy is configured to allow Unrestricted scripts. If you use Group Policy to set execution policy, make sure that the Group Policy Object (GPO) targeted at the Organizational Unit (OU) defined in the ANC is configured to allow Unrestricted scripts. For more information, see [Set-ExecutionPolicy](/powershell/module/microsoft.powershell.security/set-executionpolicy).
 - For Disaster Recovery (DR) purposes, make sure that there are at least 50% of the IP addresses available in your subnet. If reprovisioning for DR is required, sufficient new IP addresses are required for each Cloud PC provisioned on the subnet.
-- For Windows 365 Governement, make sure to complete the script options listed in [Set up tenants for Windows 365 Government](set-up-teannts-windows-365-gcc).
+- For Windows 365 Governement, make sure to complete the script options listed in [Set up tenants for Windows 365 Government](set-up-tenants-windows-365-gcc).
 
 ## Create an ANC
 

windows-365/enterprise/privacy-personal-data.md

@@ -95,8 +95,4 @@ Audit reports for Windows 365 will be available for download at the [Microsoft S
 
 [Plan your Windows 365 deployment](planning-guide.md)
 
-<<<<<<< HEAD
 [Learn about data encryption in Windows 365](encryption.md)
-=======
-[Learn about data encryption in Windows 365](encryption.md)
->>>>>>> 3ffc1afd200fb6d2421282772b4a714e486a9f3c