mc

Author: v-thepet

docs/integration-services/control-flow/azure-data-lake-analytics-task.md

@@ -29,7 +29,7 @@ To add a Data Lake Analytics task to a package, drag the task from SSIS Toolbox
 
 ## General page configuration
 
-Use the **General** page to configure the task and provide the U-SQL script that the task submits. To learn more about the U-SQL language, see [U-SQL language reference](/u-sql/).
+Use the **General** page to configure the task and provide the U-SQL script that the task submits.
 
 ### Basic configuration
 

docs/machine-learning/install/sql-pretrained-models-install.md

@@ -205,7 +205,11 @@ The following link includes example code invoking the pretrained models.
 
 ## Research and resources
 
+<<<<<<< HEAD
 Currently the models that are available are deep neural network (DNN) models for sentiment analysis and image classification. All pretrained models were trained by using Microsoft's [Computation Network Toolkit (CNTK)](/previous-versions/cognitive-toolkit/).
+=======
+Currently the models that are available are deep neural network (DNN) models for sentiment analysis and image classification. All pretrained models were trained by using Microsoft's [Computation Network Toolkit (CNTK)](https://github.com/microsoft/CNTK).
+>>>>>>> 32fa6875c59d4c3ca0cf50275c6956c46f769d30
 
 The configuration of each network was based on the following reference implementations:
 

docs/machine-learning/package-management/install-python-packages-standard-tools.md

@@ -118,4 +118,4 @@ import cntk
 
 + [Get Python package information](python-package-information.md)
 + [Python tutorials for SQL Server Machine Learning Services](../tutorials/python-tutorials.md)
-+ [Python API for CNTK](https://github.com/microsoft/CNTK/tree/master/Tutorials).
++ [Python API for CNTK](https://github.com/microsoft/CNTK)