Merge conflicts

Author: laileni-aws

src/test/codewhisperer/util/dependencyGraph/dependencyGraphFactory.test.ts

@@ -8,7 +8,7 @@ import vscode from 'vscode'
 import { join } from 'path'
 import { getTestWorkspaceFolder } from '../../../../testInteg/integrationTestsUtilities'
 import { DependencyGraphFactory } from '../../../../codewhisperer/util/dependencyGraph/dependencyGraphFactory'
-import { terraformDependencyGraph } from './../../../../codewhisperer/util/dependencyGraph/terraformDependencyGraph'
+import { terraformDependencyGraph } from '../../../../codewhisperer/util/dependencyGraph/terraformDependencyGraph'
 
 describe('DependencyGraphFactory', function () {
     const workspaceFolder = getTestWorkspaceFolder()