From cad4606246a10451629c335d276337bb2ec1e53a Mon Sep 17 00:00:00 2001
From: Charles Shin <charlshi@amazon.com>
Date: Tue, 29 Nov 2022 10:17:36 -0800
Subject: [PATCH] fix: bad merge conflict

---
 .../integration-test-templates/src/CreateFormTests.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/test-generator/integration-test-templates/src/CreateFormTests.tsx b/packages/test-generator/integration-test-templates/src/CreateFormTests.tsx
index bae2fa488..267967e8e 100644
--- a/packages/test-generator/integration-test-templates/src/CreateFormTests.tsx
+++ b/packages/test-generator/integration-test-templates/src/CreateFormTests.tsx
@@ -23,7 +23,7 @@ import {
   CustomFormCreateNestedJson,
 } from './ui-components'; // eslint-disable-line import/extensions, max-len
 
-import { AllSupportedFormFields, Owner, User, Tag, LazyTag, LazyAllSupportedFormFieldsTag } from './models';
+import { AllSupportedFormFields, Owner, User, Tag, LazyTag, Student, LazyAllSupportedFormFieldsTag } from './models';
 
 const initializeTestData = async (): Promise<void> => {
   await DataStore.save(new User({ firstName: 'John', lastName: 'Lennon', age: 29 }));