Fix warnings

Author: kraigb

docs/python/azure-sdk-for-python.md

@@ -1,11 +1,7 @@
 ---
 title: Azure SDK for Python
 description: The Azure SDK for Python makes it easy to consume Microsoft Azure services from Python applications running on any platform.
-<<<<<<< HEAD
 ms.date: 10/10/2018
-=======
-ms.date: 09/56/2018
->>>>>>> 43e6d9258a71d8aee469102da08d34e2a984b29d
 ms.prod: visual-studio-dev15
 ms.technology: vs-python
 ms.topic: conceptual

docs/python/configure-web-apps-for-iis-windows.md

@@ -19,11 +19,11 @@ ms.workload:
 When using Internet Information Services (IIS) as a web server on a Windows computer (including [Windows virtual machines on Azure](/azure/architecture/reference-architectures/n-tier/windows-vm), Python apps must include specific settings in their *web.config* files so that IIS can properly process Python code. The computer itself must also have Python installed along with any packages the web app requires.
 
 > [!Note]
-> This article previously contained guidance for configuring Python on Azure App Service on Windows. The Python extensions and Windows hosts used in that scenario have been deprecated in favor of Azure App Service on Linux. For more information, see [Publishing Python Apps to Azure App Service](publishing-python-web-apps-to-azure-from-visual-studio.md)
+> This article previously contained guidance for configuring Python on Azure App Service on Windows. The Python extensions and Windows hosts used in that scenario have been deprecated in favor of Azure App Service on Linux. For more information, see [Publishing Python Apps to Azure App Service](publishing-python-web-applications-to-azure-from-visual-studio.md)
 
 ## Install Python on Windows
 
-To run a web app, first install your required version of Python directly on the Windows host machine as described on [Install Python interpreters](install-python-interpreters.md).
+To run a web app, first install your required version of Python directly on the Windows host machine as described on [Install Python interpreters](installing-python-interpreters.md).
 
 Record the location of the `python.exe` interpreter for later steps. For convenience, you can add that location to your PATH environment variable.