Merge pull request #11365 from v-maudel/patch-24

ShannonLeavitt · web-flow · commit d8db93ead699 · 2019-08-08T09:36:38.000-06:00
C108187: Changing italic asterisks by italic underscore and escaping plaint asterisks undersocers
diff --git a/docs/relational-databases/system-tables/msmerge-conflict-publication-article-transact-sql.md b/docs/relational-databases/system-tables/msmerge-conflict-publication-article-transact-sql.md
@@ -18,17 +18,17 @@ ms.assetid: dc4490b4-02d8-4dfc-98f5-0cf8de8e11be
 author: stevestein
 ms.author: sstein
 ---
-# MSmerge_conflict_&lt;publication&gt;_&lt;article&gt; (Transact-SQL)
+# MSmerge\_conflict\_&lt;publication&gt;\_&lt;article&gt; (Transact-SQL)
 [!INCLUDE[tsql-appliesto-ss2008-xxxx-xxxx-xxx-md](../../includes/tsql-appliesto-ss2008-xxxx-xxxx-xxx-md.md)]
 
-  The **MSmerge_conflict_*publication*_*article*** table contains information on rows that conflicted or for row changes that were undone to achieve data convergence. A conflict table exists for each replicated table in a publication, where the name of the conflict table is appended with the publication and article name. These article-specific conflict tables exist in the database used for conflict logging, usually the publication database but can be the subscription database if there is decentralized conflict logging.  
+  The **MSmerge\_conflict\_*publication*\__article_** table contains information on rows that conflicted or for row changes that were undone to achieve data convergence. A conflict table exists for each replicated table in a publication, where the name of the conflict table is appended with the publication and article name. These article-specific conflict tables exist in the database used for conflict logging, usually the publication database but can be the subscription database if there is decentralized conflict logging.  
   
 |Column name|Data type|Description|  
 |-----------------|---------------|-----------------|  
-|***article_column_name***|**variable**|Represents a column in a replicated table. This system table contains one column for each column in the table article.|  
+|**_article\_column\_name_**|**variable**|Represents a column in a replicated table. This system table contains one column for each column in the table article.|  
 |**rowguid**|**uniqueidentifier**|The row identifier for the conflict row.|  
 |**ModifiedDate**|**datetime**|The time when the conflict occurred.|  
-|**origin_datasource_id**|**uniqueidentifier**|The subscription for which the row change was undone or that lost the conflict.|  
+|**origin\_datasource\_id**|**uniqueidentifier**|The subscription for which the row change was undone or that lost the conflict.|  
   
 ## See Also  
  [Replication Tables &#40;Transact-SQL&#41;](../../relational-databases/system-tables/replication-tables-transact-sql.md)   
