diff --git a/documentation/Sync-PnPSharePointUserProfilesFromAzureActiveDirectory.md b/documentation/Sync-PnPSharePointUserProfilesFromAzureActiveDirectory.md
index add6b35a3..37f2a5994 100644
--- a/documentation/Sync-PnPSharePointUserProfilesFromAzureActiveDirectory.md
+++ b/documentation/Sync-PnPSharePointUserProfilesFromAzureActiveDirectory.md
@@ -131,15 +131,7 @@ Accept wildcard characters: False
 ```
 
 ### -IdType
-<<<<<<< HEAD
-<<<<<<< HEAD
 The type of profile identifier (Email/CloudId/PrincipalName). Defaults to CloudId. Ensure that if you use this in combination with `-Users` that all of the user objects you're passing in are having their Mail property populated when choosing IdType Email, Id property for IdType CloudId or UserPrincipalName for IdType PrincipalName.
-=======
-The type of profile identifier (Email/CloudId/PrincipalName). Defaults to CloudId. Ensure that if you use this in combination with `-Users` that all of the user objects you're passing in are having their Mail property populated when choosing IdType Email, Id property for CloudId or UserPrincipalName for PrincipalName.
->>>>>>> b75bab61... Work in progress
-=======
-The type of profile identifier (Email/CloudId/PrincipalName). Defaults to CloudId. Ensure that if you use this in combination with `-Users` that all of the user objects you're passing in are having their Mail property populated when choosing IdType Email, Id property for IdType CloudId or UserPrincipalName for IdType PrincipalName.
->>>>>>> 813e9972... Minor documentatipn updates
 
 ```yaml
 Type: ImportProfilePropertiesUserIdType