Fixed merge conflict

Author: Meladie

articles/governance/blueprints/samples/pci-dss-3.2.1/control-mapping.md

@@ -2,7 +2,7 @@
 title: PCI-DSS v3.2.1 blueprint sample - Control mapping
 description: Control mapping of the Payment Card Industry Data Security Standard v3.2.1 blueprint sample to Azure Policy and RBAC.
 ms.date: 01/29/2020
-ms.topic: conceptual
+ms.topic: sample
 ---
 # Control mapping of the PCI-DSS v3.2.1 blueprint sample
 

articles/governance/blueprints/samples/pci-dss-3.2.1/deploy.md

@@ -2,7 +2,7 @@
 title: PCI-DSS v3.2.1 blueprint sample - Deploy steps
 description: Deploy steps for the Payment Card Industry Data Security Standard v3.2.1 blueprint sample including blueprint artifact parameter details.
 ms.date: 01/29/2020
-ms.topic: conceptual
+ms.topic: sample
 ---
 # Deploy the PCI-DSS v3.2.1 blueprint sample
 

articles/governance/blueprints/samples/pci-dss-3.2.1/index.md

@@ -2,7 +2,7 @@
 title: PCI-DSS v3.2.1 blueprint sample - Overview
 description: Overview of the Payment Card Industry Data Security Standard v3.2.1 blueprint sample. This blueprint sample helps customers assess specific controls.
 ms.date: 01/29/2020
-ms.topic: conceptual
+ms.topic: sample
 ---
 # Overview of the PCI-DSS v3.2.1 blueprint sample