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