fixed merge conflict

Author: mikeblome

docs/TOC.md

@@ -26,6 +26,7 @@
 # [Security Best Practices for C++](security/security-best-practices-for-cpp.md)
 ## [Running as a Member of the Users Group](security/running-as-a-member-of-the-users-group.md)
 ## [How User Account Control (UAC) Affects Your Application](security/how-user-account-control-uac-affects-your-application.md)
+## [C++ Developer Guidance for Speculative Execution Side Channels](security/developer-guidance-speculative-execution.md)
 # [Visual C++ Samples](visual-cpp-samples.md)
 # [Visual C++ Help and Community](visual-cpp-help-and-community.md)
 # [How to Report a Problem with the Visual C++ Toolset](how-to-report-a-problem-with-the-visual-cpp-toolset.md)

docs/build/reference/zp-struct-member-alignment.md

@@ -1,7 +1,7 @@
 ---
 title: "-Zp (Struct Member Alignment) | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "04/30/2018"
 ms.technology: ["cpp-tools"]
 ms.topic: "reference"
 f1_keywords: ["/zp", "VC.Project.VCCLCompilerTool.StructMemberAlignment", "VC.Project.VCCLWCECompilerTool.StructMemberAlignment"]
@@ -13,60 +13,55 @@ ms.author: "corob"
 ms.workload: ["cplusplus"]
 ---
 # /Zp (Struct Member Alignment)
-Controls how the members of a structure are packed into memory and specifies the same packing for all structures in a module.  
-  
-## Syntax  
-  
-```  
-/Zp[1|2|4|8|16]  
-```  
-  
-## Remarks  
- When you specify this option, each structure member after the first is stored on either the size of the member type or `n`-byte boundaries (where `n` is 1, 2, 4, 8, or 16), whichever is smaller.  
-  
- The available values are described in the following table.  
-  
- 1  
- Packs structures on 1-byte boundaries. Same as **/Zp**.  
-  
- 2  
- Packs structures on 2-byte boundaries.  
-  
- 4  
- Packs structures on 4-byte boundaries.  
-  
- 8  
- Packs structures on 8-byte boundaries (default).  
-  
- 16  
- Packs structures on 16-byte boundaries.  
-  
- You should not use this option unless you have specific alignment requirements.  
-  
- You can also use [pack](../../preprocessor/pack.md) to control structure packing. For more information about alignment, see:  
-  
--   [align](../../cpp/align-cpp.md)  
-  
--   [__alignof Operator](../../cpp/alignof-operator.md)  
-  
--   [__unaligned](../../cpp/unaligned.md)  
-  
--   [Examples of Structure Alignment](../../build/examples-of-structure-alignment.md) (x64 specific)  
-  
-### To set this compiler option in the Visual Studio development environment  
-  
-1.  Open the project's **Property Pages** dialog box. For details, see [Working with Project Properties](../../ide/working-with-project-properties.md).  
-  
-2.  Click the **C/C++** folder.  
-  
-3.  Click the **Code Generation** property page.  
-  
-4.  Modify the **Struct Member Alignment** property.  
-  
-### To set this compiler option programmatically  
-  
--   See <xref:Microsoft.VisualStudio.VCProjectEngine.VCCLCompilerTool.StructMemberAlignment%2A>.  
-  
-## See Also  
- [Compiler Options](../../build/reference/compiler-options.md)   
- [Setting Compiler Options](../../build/reference/setting-compiler-options.md)
+
+Controls how the members of a structure are packed into memory and specifies the same packing for all structures in a module.
+
+## Syntax
+
+> **/Zp**[**1**|**2**|**4**|**8**|**16**]
+
+## Remarks
+
+When you specify the **/Zp**_n_ option, each structure member after the first is stored on either the size of the member type or *n*-byte boundaries (where *n* is 1, 2, 4, 8, or 16), whichever is smaller.
+
+The available packing values are described in the following table:
+
+|/Zp argument|Effect|
+|-|-|
+|1|Packs structures on 1-byte boundaries. Same as **/Zp**.|
+|2|Packs structures on 2-byte boundaries.|
+|4|Packs structures on 4-byte boundaries.|
+|8|Packs structures on 8-byte boundaries (default).|
+|16| Packs structures on 16-byte boundaries.|
+
+You should not use this option unless you have specific alignment requirements.
+
+> [!WARNING]  
+> C++ headers in the Windows SDK assume **/Zp8** packing. Memory corruption may occur if the **/Zp** setting is changed when using Windows SDK headers.
+
+You can also use [pack](../../preprocessor/pack.md) to control structure packing. For more information about alignment, see:
+
+- [align](../../cpp/align-cpp.md)
+
+- [__alignof Operator](../../cpp/alignof-operator.md)
+
+- [__unaligned](../../cpp/unaligned.md)
+
+- [Examples of Structure Alignment](../../build/examples-of-structure-alignment.md) (x64 specific)
+
+### To set this compiler option in the Visual Studio development environment
+
+1.  Open the project's **Property Pages** dialog box. For details, see [Working with Project Properties](../../ide/working-with-project-properties.md).
+
+1. Select the **C/C++** > **Code Generation** property page.
+
+1. Modify the **Struct Member Alignment** property.
+
+### To set this compiler option programmatically
+
+-   See <xref:Microsoft.VisualStudio.VCProjectEngine.VCCLCompilerTool.StructMemberAlignment%2A>.
+
+## See also
+
+- [Compiler Options](../../build/reference/compiler-options.md)   
+- [Setting Compiler Options](../../build/reference/setting-compiler-options.md)