resolved conflicts

Author: Kasey Uhlenhuth

docs/ide/visual-studio-2017-for-dotnet-developers.md

@@ -19,7 +19,7 @@ Learn how [Visual Studio 2017](https://visualstudio.microsoft.com/downloads/?utm
 
 ##  I'm used to my keyboard shortcuts from a different extension/editor/IDE.
 
-**New in Visual Studio 2017 version 15.8** If you are coming from another IDE or coding environment, you can change your keyboard scheme to *Visual Studio Code* or *ReSharper (Visual Studio)*:
+**New in Visual Studio 2017 version 15.8** If you're coming from another IDE or coding environment, you can change your keyboard scheme to *Visual Studio Code* or *ReSharper (Visual Studio)*:
 
 ![Keyboard Schemes in Visual Studio](../ide/media/VS2017Guide-Keyboard.png)
 
@@ -145,4 +145,4 @@ Here is a list of editor and productivity features to make writing code more eff
 ## Missing a feature that makes you productive or experiencing poor performance?
 There are several ways to leave us feedback:
 - .NET feature requests can be filed on our [GitHub repo](https://github.com/dotnet/roslyn/issues).
-- Visual Studio feature requests, bugs, and performance issues can be filed by using the **Send Feedback** icon at the top-right of your Visual Studio window.
+- Visual Studio feature requests, bugs, and performance issues can be filed by using the **Send Feedback** icon at the top-right of your Visual Studio window.