From ecae3243d3b201b8277cac552a705373c3a4b89f Mon Sep 17 00:00:00 2001
From: Karthik Nadig <kanadig@microsoft.com>
Date: Mon, 28 Sep 2020 11:09:22 -0700
Subject: [PATCH] Fix more merge issues.

---
 .../base/locators/composite/environmentsResolver.ts            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/pythonEnvironments/base/locators/composite/environmentsResolver.ts b/src/client/pythonEnvironments/base/locators/composite/environmentsResolver.ts
index 347785f73660..83ea21e726e5 100644
--- a/src/client/pythonEnvironments/base/locators/composite/environmentsResolver.ts
+++ b/src/client/pythonEnvironments/base/locators/composite/environmentsResolver.ts
@@ -5,7 +5,8 @@ import { cloneDeep } from 'lodash';
 import { Event, EventEmitter } from 'vscode';
 import { traceVerbose } from '../../../../common/logger';
 import { IEnvironmentInfoService } from '../../../info/environmentInfoService';
-import { areSameEnvironment, PythonEnvInfo } from '../../info';
+import { PythonEnvInfo } from '../../info';
+import { areSameEnvironment } from '../../info/env';
 import { InterpreterInformation } from '../../info/interpreter';
 import {
     ILocator, IPythonEnvsIterator, PythonEnvUpdatedEvent, PythonLocatorQuery,