Fix merge issues

Author: jramsay

src/server/editorServices.ts

@@ -254,12 +254,12 @@ namespace ts.server {
         private readonly directoryWatchers: DirectoryWatchers;
         private readonly throttledOperations: ThrottledOperations;
 
+        private readonly hostConfiguration: HostConfiguration;
+
         private changedFiles: ScriptInfo[];
 
         readonly toCanonicalFileName: (f: string) => string;
 
-        public readonly hostConfiguration: HostConfiguration;
-
         public lastDeletedFile: ScriptInfo;
 
         constructor(public readonly host: ServerHost,

src/server/project.ts

@@ -296,6 +296,9 @@ namespace ts.server {
         }
 
         enableLanguageService() {
+            if (this.languageServiceEnabled) {
+                return;
+            }
             this.languageServiceEnabled = true;
             this.projectService.onUpdateLanguageServiceStateForProject(this, /*languageServiceEnabled*/ true);
         }