message: Removed conflict indicator
diff: import * as vscode from "vscode";
  import * as path from "path";
  -<<<<<<< HEAD
  -=======
  -import { AzureAuth } from './azure-auth/azureAuth';
  -import { Controller } from "./controller";
  ->>>>>>> dev
  /**
  * Manages react webview panels
  