Resolving merge issues.

Author: TimShererWithAquent

.gitignore

@@ -22,3 +22,5 @@ articles/directories.txt
 AzureMigration.ps1
 
 !/.vscode/extensions.json
+articles/data-lake-analytics/.vscode/settings.json
+.gitignore

.openpublishing.publish.config.json

@@ -271,6 +271,16 @@
       "url": "https://github.com/Azure-Samples/cognitive-services-java-sdk-samples",
       "branch": "master"
     },
+    {
+      "path_to_root": "cognitive-services-node-sdk-samples",
+      "url": "https://github.com/Azure-Samples/cognitive-services-node-sdk-samples",
+      "branch": "master"
+    },
+    {
+      "path_to_root": "cognitive-services-ruby-sdk-samples",
+      "url": "https://github.com/Azure-Samples/cognitive-services-ruby-sdk-samples",
+      "branch": "master"
+    },
     {
       "path_to_root": "cognitive-services-rest-samples",
       "url": "https://github.com/Azure-Samples/cognitive-services-REST-api-samples",
@@ -291,6 +301,11 @@
       "url": "https://github.com/Azure-Samples/cognitive-services-face-android-detect",
       "branch": "master"
     },
+    {
+      "path_to_root": "azure-sdk-for-go-samples",
+      "url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
+      "branch": "master"
+    },
     {
       "path_to_root": "cosmos-dotnet-getting-started",
       "url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",
@@ -342,6 +357,11 @@
       "url": "https://github.com/Azure-Samples/azure-cosmos-db-sql-api-nodejs-getting-started",
       "branch": "master"
     },
+    {
+      "path_to_root": "azure-cosmos-db-python-getting-started",
+      "url": "https://github.com/Azure-Samples/azure-cosmos-db-python-getting-started",
+      "branch": "master"
+    },
     {
       "path_to_root": "cognitive-services-content-moderator-samples",
       "url": "https://github.com/Azure-Samples/cognitive-services-content-moderator-samples",
@@ -392,6 +412,11 @@
       "path_to_root": "azure-cosmosdb-java-v2",
       "url": "https://github.com/Azure/azure-cosmosdb-java",
       "branch": "master"
+    },
+    {
+      "path_to_root": "azure-cosmosdb-java-v4-getting-started",
+      "url": "https://github.com/Azure-Samples/azure-cosmos-java-getting-started",
+      "branch": "master"
     }
   ],
   "branch_target_mapping": {