diff --git a/src/App.tsx b/src/App.tsx
index 45ed568..a9b3e7e 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -2,7 +2,6 @@
 import React from 'react';
 import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
 import { RecoilRoot } from 'recoil';
-<<<<<<< Updated upstream
 import { ThemeProvider } from 'styled-components';
 import { theme } from 'styles/colors';
 import AddGroupInputCount from './pages/AddGroupMain/AddGroupInputCount';
@@ -32,7 +31,6 @@ function App() {
         <MainScreen>
           <ThemeProvider theme={theme}>
             <Routes>
-<<<<<<< Updated upstream
               <Route path="/" element={<EnterMain />} />
               <Route path="login" element={<EnterLogin />} />
               <Route path="login/clause" element={<EnterClause />} />
@@ -55,14 +53,6 @@ function App() {
               <Route path="vote/create" element={<VoteMainPage />} />
               <Route path="vote/excute" element={<VoteMainPage />} />
               <Route path="vote/detail" element={<VoteMainPage />} />
-=======
-              <Route path="/head-count" element={<AddGroupInputCount />} />
-              <Route path="/Space" element={<AddGroupSpace />} />
-              <Route path="/member-name" element={<AddGroupMemberName />} />
-              <Route path="/group-type" element={<AddGroupType />} />
-              <Route path="/loading" element={<AddGroupLoading />} />
-              <Route path="/share" element={<AddGroupShare />} />
->>>>>>> Stashed changes
             </Routes>
           </ThemeProvider>
         </MainScreen>
diff --git a/src/components/AddGroup/AddGroupMembername/membernameList/membernameCreate.tsx b/src/components/AddGroup/AddGroupMembername/membernameList/membernameCreate.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/AddGroup/AddGroupMembername/membernameList/membernameList.tsx b/src/components/AddGroup/AddGroupMembername/membernameList/membernameList.tsx
index 298ff9a..4993005 100644
--- a/src/components/AddGroup/AddGroupMembername/membernameList/membernameList.tsx
+++ b/src/components/AddGroup/AddGroupMembername/membernameList/membernameList.tsx
@@ -1,20 +1,8 @@
-import { useState, React } from 'react';
+import { useState } from 'react';
 import * as S from './Styles';
-import MembernameCreate from './membernameCreate';
 
 const membernameList = () => {
-  return (
-    <S.nameLayout>
-      <S.nameList>
-        <S.nameContainer>
-          <S.nameBox>
-
-          </S.nameBox>
-          <S.nameButton type={'button'}>ⓧ</S.nameButton>
-        </S.nameContainer>
-      </S.nameList>
-    </S.nameLayout>
-  );
+  return <S.Layout />;
 };
 
 export default membernameList;