fixes

Author: Mikejo5000

docs/javascript/tutorial-asp-net-core-with-react.md

@@ -119,15 +119,7 @@ Make sure to install the following:
    >[!NOTE]
    > Check console output for messages, such as a message instructing you to update your version of Node.js.
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-You should see an React app appear, that is populated via the API. If you don't see the app, see [Troubleshooting](#troubleshooting).
-=======
 You should see a React app appear, that is populated via the API. If you don't see the app, see [Troubleshooting](#troubleshooting).
->>>>>>> e544f53505bc3ae40a8373f51b01c45500805bfa
-=======
-You should see a React app appear, that is populated via the API. If you don't see the app, see [Troubleshooting](#troubleshooting).
->>>>>>> 8bee33d8bd3bd4ad0353717553013d252b3e61f9
 
 ## Publish the project
 

docs/profiling/profiling-feature-tour.md

@@ -184,7 +184,6 @@ The tool shows each async operation in a list view. You can see information such
 
 ![.NET Async Tool Stopped](../profiling/media/vs-2022/prof-tour-async-tool.png ".NET Async Tool Stopped")
 ::: moniker-end
-
 ::: moniker range="vs-2019"
 ## Analyze asynchronous code (.NET)
 
@@ -195,8 +194,6 @@ The tool shows each async operation in a list view. You can see information such
 ![.NET Async Tool Stopped](../profiling/media/async-tool-opened.png ".NET Async Tool Stopped")
 ::: moniker-end
 
-::: moniker range=">=vs-2019"
-
 ## Examine application events
 
 The generic [events viewer](../profiling/events-viewer.md) allows you to view the activity of your application through a list of events, such as module load, thread start, and system configurations, to help better diagnose how your application is performing right within the Visual Studio profiler. This tool is available in the Performance Profiler. Open the Performance Profiler by choosing **Debug** > **Performance Profiler** (or **Alt + F2**).
@@ -233,8 +230,6 @@ The tool shows live values for each counter in a list view.
 
 :::image type="content" source="../profiling/media/dotnet-counters-tool-collecting.png" alt-text=".NET Counter tool collecting.":::
 
-::: moniker-end
-
 ## Analyze resource consumption (XAML)
 
 In XAML apps, such as Windows desktop WPF apps and UWP apps, you can analyze resource consumption using the Application Timeline tool. For example, you can analyze the time spent by your application preparing UI frames (layout and render), servicing network and disk requests, and in scenarios like application startup, page load, and Window resize. To use the tool, choose **Application Timeline** in the Performance Profiler, and then choose **Start**. In your app, go through the scenario with a suspected resource consumption issue, and then choose **Stop collection** to generate the report.