diff --git a/frontend/src/components/common/Form.tsx b/frontend/src/components/common/Form.tsx
index efb6a5f..991950a 100644
--- a/frontend/src/components/common/Form.tsx
+++ b/frontend/src/components/common/Form.tsx
@@ -1,8 +1,13 @@
-import React from 'react'
+import type { ReactNode } from 'react'
 
+<<<<<<< Updated upstream
 import type { FC } from 'react'
 
 type Props = { children: React.ReactNode }
+=======
+
+type Props = { children: ReactNode }
+>>>>>>> Stashed changes
 
 
 export default (({ children }: Props) => (