Add in new-team and set-team picture

Author: islubin

teams/teams-ps/teams/New-Team.md

@@ -261,8 +261,14 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+<<<<<<< HEAD
 ### -AllowDeleteChannels
 Setting that determines whether or not members (and not only owners) can delete channels in the team.
+=======
+### -Group
+Use this parameter to specify the ExternalDirectoryObjectId of a group you would like to convert to a team.
+If you are using this parameter, do not specify other parameters.
+>>>>>>> ed3897c8e76fbea19b7802f09f128b6a16cf33cb
 
 ```yaml
 Type: Boolean

teams/teams-ps/teams/Set-TeamPicture.md

@@ -1,20 +1,35 @@
 ---
 external help file: Microsoft.TeamsCmdlets.PowerShell.Custom.dll-Help.xml
 Module Name: MicrosoftTeams
+<<<<<<< HEAD
+=======
+applicable: Microsoft Teams
+title: Set-TeamPicture
+>>>>>>> ed3897c8e76fbea19b7802f09f128b6a16cf33cb
 online version:
 schema: 2.0.0
 ---
 
 # Set-TeamPicture
 
 ## SYNOPSIS
+<<<<<<< HEAD
 
 Update the team picture.
 
 Note: the command will return immediately, but the Teams application will not reflect the update immediately. 
 The Teams application may need to be open for up to an hour before changes are reflected. 
 
 Note: this cmdlet is not support in special government environments (TeamsGCCH and TeamsDoD) and is currently only supported in our beta release.
+=======
+
+Note: This cmdlet is currently in Beta.
+
+Update the team picture.
+
+Note: the command will return immediately, but the Teams application will not reflect the update immediately.
+The Teams application may need to be open for up to an hour before changes are reflected.
+>>>>>>> ed3897c8e76fbea19b7802f09f128b6a16cf33cb
 
 ## SYNTAX
 
@@ -26,14 +41,22 @@ Set-TeamPicture -GroupId <String> -ImagePath <String> [<CommonParameters>]
 
 ## EXAMPLES
 
+<<<<<<< HEAD
 ### Example 1
 ```
 Set-TeamPicture -GroupId 2f162b0e-36d2-4e15-8ba3-ba229cecdccf -ImagePath c:\Image\TeamPictire.png
+=======
+### --------------------------  Example 1  --------------------------
+
+```powershell
+Set-TeamPicture -GroupId 2f162b0e-36d2-4e15-8ba3-ba229cecdccf -ImagePath c:\Image\TeamPicture.png
+>>>>>>> ed3897c8e76fbea19b7802f09f128b6a16cf33cb
 ```
 
 ## PARAMETERS
 
 ### -GroupId
+
 GroupId of the team
 
 ```yaml
@@ -49,7 +72,12 @@ Accept wildcard characters: False
 ```
 
 ### -ImagePath
+<<<<<<< HEAD
 File path and image ( .png, .gif, .jpg, or .jpeg)
+=======
+
+File path and image (*.png, *.gif, *.jpg, or *.jpeg)
+>>>>>>> ed3897c8e76fbea19b7802f09f128b6a16cf33cb
 
 ```yaml
 Type: String