From fd3f410cc6f2707dc6bc9543ee8e21f73241983f Mon Sep 17 00:00:00 2001
From: John Mitchell <jmitchel@Johns-MacBook-Pro-46.local>
Date: Fri, 21 Feb 2020 13:43:09 -0500
Subject: [PATCH] fix conflict

---
 .../src/screens/User/shared/UserForm.jsx      | 29 -------------------
 1 file changed, 29 deletions(-)

diff --git a/awx/ui_next/src/screens/User/shared/UserForm.jsx b/awx/ui_next/src/screens/User/shared/UserForm.jsx
index d6987c1963..bc785a0ec1 100644
--- a/awx/ui_next/src/screens/User/shared/UserForm.jsx
+++ b/awx/ui_next/src/screens/User/shared/UserForm.jsx
@@ -101,34 +101,6 @@ function UserFormFields({ user, i18n }) {
         type="text"
       />
       {!user.id && (
-<<<<<<< HEAD
-            <OrganizationLookup
-    helperTextInvalid={organizationMeta.error}
-    isValid={!organizationMeta.touched || !organizationMeta.error}
-    onBlur={() => organizationHelpers.setTouched()}
-              onChange={value => {
-      organizationHelpers.setValue(value.id);
-                setOrganization(value);
-              }}
-              value={organization}
-              required
-            />
-          )}
-            <FormGroup
-              fieldId="user-type"
-  helperTextInvalid={userTypeMeta.error}
-              isRequired
-  isValid={!userTypeMeta.touched || !userTypeMeta.error}
-              label={i18n._(t`User Type`)}
-            >
-              <AnsibleSelect
-    isValid={!userTypeMeta.touched || !userTypeMeta.error}
-                id="user-type"
-                data={userTypeOptions}
-    {...userTypeField}
-              />
-            </FormGroup>
-=======
         <OrganizationLookup
           helperTextInvalid={organizationMeta.error}
           isValid={!organizationMeta.touched || !organizationMeta.error}
@@ -155,7 +127,6 @@ function UserFormFields({ user, i18n }) {
           {...userTypeField}
         />
       </FormGroup>
->>>>>>> update forms from FormRow to using FormLayout components
     </>
   );
 }