From a079e01c0e291fe0fce6d0dbeb888fe8980f590e Mon Sep 17 00:00:00 2001
From: Lu Han <lhnamz@amazon.com>
Date: Thu, 2 Sep 2021 23:15:15 -0700
Subject: [PATCH] feat: rebase for conflict

---
 packages/amplify-cli-core/src/state-manager/stateManager.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/amplify-cli-core/src/state-manager/stateManager.ts b/packages/amplify-cli-core/src/state-manager/stateManager.ts
index bb167fd831b..b9778e233a3 100644
--- a/packages/amplify-cli-core/src/state-manager/stateManager.ts
+++ b/packages/amplify-cli-core/src/state-manager/stateManager.ts
@@ -1,9 +1,7 @@
 import * as fs from 'fs-extra';
-import * as path from 'path';
 import _ from 'lodash';
-import Ajv from "ajv";
-import { PathConstants, PathManager, pathManager } from './pathManager';
-import { $TSMeta, $TSTeamProviderInfo, $TSAny, DeploymentSecrets, writeCFNTemplate, readCFNTemplate } from '..';
+import { pathManager } from './pathManager';
+import { $TSMeta, $TSTeamProviderInfo, $TSAny, DeploymentSecrets, HooksConfig } from '..';
 import { JSONUtilities } from '../jsonUtilities';
 import { SecretFileMode } from '../cliConstants';
 import { HydrateTags, ReadTags, Tag } from '../tags';