diff --git a/build/yarn.lock b/build/yarn.lock
index f3873e9e2e..faebab31b9 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -384,7 +384,7 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-"dataprotocol-client@file:./../dataprotocol-client":
+"dataprotocol-client@file:../dataprotocol-client":
   version "1.0.0"
   dependencies:
     typescript "2.6.2"
@@ -569,11 +569,7 @@ extend@~1.2.1:
 "extensions-modules@file:../extensions-modules":
   version "0.1.0"
   dependencies:
-<<<<<<< HEAD
-    dataprotocol-client "file:./../../../../AppData/Local/Yarn/cache/v1/dataprotocol-client"
-=======
     dataprotocol-client "file:C:/Users/andresse/AppData/Local/Yarn/cache/v1/dataprotocol-client"
->>>>>>> master
     decompress "^4.2.0"
     fs-extra-promise "^1.0.1"
     http-proxy-agent "^2.0.0"
diff --git a/extensions-modules/src/languageservice/serviceClient.ts b/extensions-modules/src/languageservice/serviceClient.ts
index 612a588db5..d8d36c6ace 100644
--- a/extensions-modules/src/languageservice/serviceClient.ts
+++ b/extensions-modules/src/languageservice/serviceClient.ts
@@ -411,7 +411,22 @@ export class SqlToolsServiceClient {
 				configurationSection: SqlToolsServiceClient._constants.extensionConfigSectionName
 			},
 			errorHandler: new LanguageClientErrorHandler(SqlToolsServiceClient._constants),
-			serverConnectionMetadata: this._config.getConfigValue(Constants.serverConnectionMetadata)
+			serverConnectionMetadata: this._config.getConfigValue(Constants.serverConnectionMetadata),
+			outputChannel: {
+				append: () => {
+				},
+				appendLine: () => {
+				},
+				dispose: () => {
+				},
+				clear: () => {
+				},
+				hide: () => {
+				},
+				name: '',
+				show: () => {
+				}
+			}
 		};
 
 		this._serviceStatus.showServiceLoading();
diff --git a/extensions-modules/yarn.lock b/extensions-modules/yarn.lock
index a1bc841428..a93c913679 100644
--- a/extensions-modules/yarn.lock
+++ b/extensions-modules/yarn.lock
@@ -337,7 +337,7 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-"dataprotocol-client@file:./../dataprotocol-client":
+"dataprotocol-client@file:../dataprotocol-client":
   version "1.0.0"
   dependencies:
     typescript "2.6.2"
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
index ba62dee993..e5b188723d 100644
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -48,7 +48,7 @@ core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-"dataprotocol-client@file:./../dataprotocol-client":
+"dataprotocol-client@file:../dataprotocol-client":
   version "1.0.0"
   dependencies:
     typescript "2.6.2"
@@ -133,11 +133,7 @@ es6-promisify@^5.0.0:
 "extensions-modules@file:../extensions-modules":
   version "0.1.0"
   dependencies:
-<<<<<<< HEAD
-    dataprotocol-client "file:./../../../../AppData/Local/Yarn/cache/v1/dataprotocol-client"
-=======
     dataprotocol-client "file:C:/Users/andresse/AppData/Local/Yarn/cache/v1/dataprotocol-client"
->>>>>>> master
     decompress "^4.2.0"
     fs-extra-promise "^1.0.1"
     http-proxy-agent "^2.0.0"