diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 30010981..7b75fb4d 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,3 +1,4 @@
+
 {
     "name": "frontend",
     "version": "0.1.0",
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index c94a6ea1..a465e1a9 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -69,6 +69,7 @@ export const StateContext = createContext<StateContextType>({
 export default function App() {
     const [isLoading, setIsLoading] = useState<{ [stepId: string]: boolean }>(
         {},
+<<<<<<< HEAD
     );
     const [inputText, setInputText] = useState<string>('');
     const [introduction, setIntroduction] = useState<string>('');
@@ -121,5 +122,58 @@ export default function App() {
                 </BrowserRouter>
             </QueryClientProvider>
         </StateContext.Provider>
+=======
+>>>>>>> main
     );
+    const [inputText, setInputText] = useState<string>('');
+    const [introduction, setIntroduction] = useState<string>('');
+    const [isIntroduction, setIsIntroduction] = useState<boolean>(false);
+    const [conclusion, setConclusion] = useState<string>('');
+    const [isConclusion, setIsConclusion] = useState<boolean>(false);
+    const [title, setTitle] = useState<{ [stepId: string]: string[] }>({});
+    const [description, setDescription] = useState<{
+        [stepId: string]: string[];
+    }>({});
+    const [openCode, setOpenCode] = useState<{ [stepId: string]: boolean }>({
+        [0]: false,
+    });
+    const [code, setCode] = useState<{ [stepId: string]: string[] }>({});
+
+    return (
+        <StateContext.Provider
+            value={{
+                isLoading,
+                setIsLoading,
+                inputText,
+                setInputText,
+                introduction,
+                setIntroduction,
+                isIntroduction,
+                setIsIntroduction,
+                conclusion,
+                setConclusion,
+                isConclusion,
+                setIsConclusion,
+                title,
+                setTitle,
+                description,
+                setDescription,
+                openCode,
+                setOpenCode,
+                code,
+                setCode,
+            }}
+        >
+            <QueryClientProvider client={queryClient}>
+                <GlobalStyle />
+                <BrowserRouter>
+                    <AppDiv>
+                        <Routes>
+                            <Route path="/" element={<ConsolePage />} />
+                            <Route path="/code" element={<CodeInputPage />} />
+                        </Routes>
+                    </AppDiv>
+                </BrowserRouter>
+            </QueryClientProvider>
+        </StateContext.Provider>
 }