another merge conflict

Author: mikeblome

docs/security/developer-guidance-speculative-execution.md

@@ -2,16 +2,12 @@
 title: "C++ Developer Guidance for Speculative Execution Side Channels | Microsoft Docs"
 ms.custom: ""
 ms.date: "05/03/2018"
-ms.reviewer: ""
-ms.suite: ""
 ms.technology: ["cpp-windows"]
-ms.tgt_pltfrm: ""
-ms.topic: "article"
+ms.topic: "conceptual"
 dev_langs: ["C++"]
 helpviewer_keywords: ["Visual C++, security", "security [C++]", "security [C++], best practices", "Spectre", "CVE-2017-5753", "Speculative Execution"]
 author: "mamillmsft"
 ms.author: "mikeblome"
-manager: "wpickett"
 ms.workload: ["cplusplus"]
 ---
 # C++ Developer Guidance for Speculative Execution Side Channels
@@ -243,4 +239,4 @@ Another technique that can be used to mitigate speculative execution side channe
 
 [Guidance to mitigate speculative execution side-channel vulnerabilities](https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/ADV180002)
 
-[Mitigating speculative execution side channel hardware vulnerabilities](https://blogs.technet.microsoft.com/srd/2018/03/15/mitigating-speculative-execution-side-channel-hardware-vulnerabilities/)
+[Mitigating speculative execution side channel hardware vulnerabilities](https://blogs.technet.microsoft.com/srd/2018/03/15/mitigating-speculative-execution-side-channel-hardware-vulnerabilities/)

docs/security/security-best-practices-for-cpp.md

@@ -10,7 +10,6 @@ helpviewer_keywords: ["Visual C++, security", "security [C++]", "security [C++],
 ms.assetid: 86acaccf-cdb4-4517-bd58-553618e3ec42
 author: "mikeblome"
 ms.author: "mikeblome"
-manager: "wpickett"
 ms.workload: ["cplusplus"]
 ---
 # Security Best Practices for C++