fixed merge conflicts from private repo

windows/deployment/usmt/usmt-conflicts-and-precedence.md

@@ -8,6 +8,7 @@ ms.author: greglin
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
+audience: itpro
 author: greg-lindsay
 ms.date: 04/19/2017
 ms.topic: article
@@ -68,7 +69,7 @@ If you have an <include> rule in one component and a <locationModify&gt
 
 The following .xml file migrates all files from C:\\Userdocs, including .mp3 files, because the <exclude> rule is specified in a separate component.
 
-```xml
+``` xml
 <migration urlid="http://www.microsoft.com/migration/1.0/migxmlext/UserDocs">
 <component type="Documents" context="System">
 <displayName>User Documents</displayName>
@@ -102,7 +103,7 @@ The following .xml file migrates all files from C:\\Userdocs, including .mp3 fil
 
 Specifying `migrate="no"` in the Config.xml file is the same as deleting the corresponding component from the migration .xml file. However, if you set `migrate="no"` for My Documents, but you have a rule similar to the one shown below in a migration .xml file (which includes all of the .doc files from My Documents), then only the .doc files will be migrated, and all other files will be excluded.
 
-```xml
+``` xml
 <include>
    <objectSet>
       <pattern type="File">%CSIDL_PERSONAL%\* [*.doc] </pattern>
@@ -135,7 +136,7 @@ If there are conflicting rules within a component, the most specific rule is app
 
 In the following example, mp3 files will not be excluded from the migration. This is because directory names take precedence over the file extensions.
 
-```xml
+``` xml
 <include>
      <objectSet>
           <pattern type="File">C:\Data\* [*]</pattern>
@@ -390,7 +391,7 @@ The destination computer contains the following files:
 
 You have a custom .xml file that contains the following code:
 
-```xml
+``` xml
 <include> 
    <objectSet> 
       <pattern type="File">c:\data\* [*]</pattern>