diff --git a/src/app/api-doc/react-swagger.tsx b/src/app/api-doc/react-swagger.tsx
index 0dd3931..f7d8488 100644
--- a/src/app/api-doc/react-swagger.tsx
+++ b/src/app/api-doc/react-swagger.tsx
@@ -4,11 +4,19 @@ import SwaggerUI from 'swagger-ui-react';
 import 'swagger-ui-react/swagger-ui.css';
 
 type Props = {
+<<<<<<< HEAD
   spec: object;
+=======
+  spec: object,
+>>>>>>> 57e420f (feat(api): add swagger docs, /api/user/me GET and PUT endpoints)
 };
 
 function ReactSwagger({ spec }: Props) {
   return <SwaggerUI spec={spec} />;
 }
 
+<<<<<<< HEAD
 export default ReactSwagger;
+=======
+export default ReactSwagger;
+>>>>>>> 57e420f (feat(api): add swagger docs, /api/user/me GET and PUT endpoints)