1769497, fixed more merge conflicts.

john-par · john-par · commit ec35708605cc · 2020-09-11T09:34:56.000-07:00
diff --git a/docs/overview/what-s-new-for-visual-cpp-in-visual-studio.md b/docs/overview/what-s-new-for-visual-cpp-in-visual-studio.md
@@ -644,11 +644,7 @@ The Clang/C2 toolset that ships with Visual Studio 2017 now supports the **`/big
 
 The C++ Core Checkers for enforcing the [C++ Core Guidelines](https://github.com/isocpp/CppCoreGuidelines) are now distributed with Visual Studio. Enable the checkers in the **Code Analysis Extensions** page in the project's property pages. The extensions are then included when you run code analysis. For more information, see [Using the C++ Core Guidelines checkers](/cpp/code-quality/using-the-cpp-core-guidelines-checkers).
 
-<<<<<<< HEAD
 ![A screenshot of the Property Pages dialog box showing Configuration Properties > Code Analysis > General selected and a number of Core Checks listed in teh Run this rule set section.](media/CppCoreCheck.png "CppCoreCheck properties page")
-=======
-![Shows how to use the Code Analysis property page to select C++ Core Check rulesets.](media/CppCoreCheck.png "CppCoreCheck properties page")
->>>>>>> 046fa0b5595809b6fbd7cc00ebc44e96b61301fb
 
 ##### Visual Studio 2017 version 15.3
 
@@ -696,11 +692,7 @@ Visual Studio Graphics Diagnostics tools: You can use them to record and analyze
 
 - **Search and filter in the object table:** Provides a quick and easy way to find the resources you're looking for.
 
-<<<<<<< HEAD
   ![A screenshot of the Object Table section with the Type drop-down and Search text box called out.](media/search.png)
-=======
-  ![Shows the location of the filter and search controls on the Object Table window.](media/search.png)
->>>>>>> 046fa0b5595809b6fbd7cc00ebc44e96b61301fb
 
 - **Resource History:** This new view provides a streamlined way of seeing the entire modification history of a resource as it was used during the rendering of a captured frame. To invoke the history for any resource, click the clock icon next to any resource hyperlink.
 
