diff --git a/src/Layout.vue b/src/Layout.vue
index 3e4c26c..ca51b34 100644
--- a/src/Layout.vue
+++ b/src/Layout.vue
@@ -1,7 +1,11 @@
 <template>
   <Header />
   <main :class='[
+<<<<<<< HEAD
     "w-full", "h-full", "px-3",
+=======
+    "w-full", "h-full",
+>>>>>>> 49ca1fac60aecb94a7d76865c14a673f1ca1eccf
     "flex", "justify-center", "flex-1",
     "bg-neutral-100", "dark:bg-zinc-800",
     "text-black",  "dark:text-white",
diff --git a/src/css/global.css b/src/css/global.css
index 2690caa..b11eb7e 100644
--- a/src/css/global.css
+++ b/src/css/global.css
@@ -1,7 +1,10 @@
 html, body {
   width: 100%;
   height: 100%;
+<<<<<<< HEAD
   max-height: fit-content;
+=======
+>>>>>>> 49ca1fac60aecb94a7d76865c14a673f1ca1eccf
   margin: 0;
 }
 
@@ -12,4 +15,8 @@ html {
 body {
   display: flex;
   flex-direction: column;
+<<<<<<< HEAD
+=======
+  min-height: 100vh;
+>>>>>>> 49ca1fac60aecb94a7d76865c14a673f1ca1eccf
 }
\ No newline at end of file
diff --git a/src/lib/account.ts b/src/lib/account.ts
index 75742e0..4f531d0 100644
--- a/src/lib/account.ts
+++ b/src/lib/account.ts
@@ -4,7 +4,14 @@ export async function isSignin(db: Database) {
   const origin = await getByIndex(db.server, "name", "origin");
   const token = await getByIndex(db.server, "name", "token");
   
+<<<<<<< HEAD
   if (!origin || !token) {
+=======
+  if (
+    origin === undefined ||
+    token === undefined
+  ) {
+>>>>>>> 49ca1fac60aecb94a7d76865c14a673f1ca1eccf
     return false;
   }
   
diff --git a/src/routes/index.vue b/src/routes/index.vue
index b6e4ea0..e928a87 100644
--- a/src/routes/index.vue
+++ b/src/routes/index.vue
@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
   <div
     v-if="processStatus === true"
     :class='[
@@ -33,10 +34,13 @@
     
     <Progress v-if='processStatus === "async"' />
   </div>
+=======
+>>>>>>> 49ca1fac60aecb94a7d76865c14a673f1ca1eccf
 </template>
 
 <script lang="ts" setup>
 import { useHead } from "@vueuse/head";
+<<<<<<< HEAD
 import Database, { getByIndex } from "@/lib/db";
 import useAPI from "@/lib/api";
 import { isSignin } from "@/lib/account";
@@ -44,12 +48,18 @@ import { useRouter } from "vue-router";
 import { ref } from "vue";
 import Progress from "@/components/Progress.vue";
 import User from "@/components/User.vue";
+=======
+import Database from "@/lib/db";
+import { isSignin } from "@/lib/account";
+import { useRouter } from "vue-router";
+>>>>>>> 49ca1fac60aecb94a7d76865c14a673f1ca1eccf
 
 useHead({
   title: "ホーム | Clean Follow uwuzu",
 });
 
 const db = new Database();
+<<<<<<< HEAD
 const router = useRouter();
 
 const me = ref<any>();
@@ -98,4 +108,10 @@ const hostname = ref<string>("");
   
   processStatus.value = false;
 }) ();
+=======
+
+if (!await isSignin(db)) {
+  useRouter().replace("/signin");
+}
+>>>>>>> 49ca1fac60aecb94a7d76865c14a673f1ca1eccf
 </script>
\ No newline at end of file
diff --git a/src/routes/signin/callback.vue b/src/routes/signin/callback.vue
index 5a011a8..5d35ac9 100644
--- a/src/routes/signin/callback.vue
+++ b/src/routes/signin/callback.vue
@@ -21,10 +21,30 @@
     ]'
   >
     <h1 class="text-3xl font-bold">確認</h1>
+<<<<<<< HEAD
     <User
       :meData="meData"
       :hostname="hostname"
     />
+=======
+    <div class="flex w-full border rounded-lg p-2">
+      <img
+        :src="meData.user_icon"
+        :alt="`${tokenData.username}さんのアイコン`"
+        class="w-30 h-30 rounded-full"
+      />
+      <div class="flex flex-col ml-2">
+        <span class="text-2xl font-bold">{{ meData.username }}</span>
+        <span>@{{ meData.userid }}@{{ hostname }}</span>
+        
+        <textarea
+          class="resize-none h-full"
+          v-html="meData.profile"
+          disabled
+        />
+      </div>
+    </div>
+>>>>>>> 49ca1fac60aecb94a7d76865c14a673f1ca1eccf
     <p>あなたは{{ meData.username }}ですか？</p>
     
     <div class="flex gap-6">
@@ -69,8 +89,12 @@ import useAPI from "@/lib/api";
 import Database from "@/lib/db";
 import Progress from "@/components/Progress.vue";
 import Button from "@/components/Button.vue";
+<<<<<<< HEAD
 import { ref } from "vue";import User from "@/components/User.vue";
 
+=======
+import { ref } from "vue";
+>>>>>>> 49ca1fac60aecb94a7d76865c14a673f1ca1eccf
 
 const db = new Database();
 const query = useRoute().query;
@@ -85,8 +109,14 @@ useHead({
   title: "サインイン処理 | Clean Follow uwuzu",
 });
 
+<<<<<<< HEAD
 if (await isSignin(db))
   useRouter().replace("/");
+=======
+if (await isSignin(db)) {
+  useRouter().replace("/");
+}
+>>>>>>> 49ca1fac60aecb94a7d76865c14a673f1ca1eccf
 
 const stageDetails = {
   redirect: "リダイレクトしています",
diff --git a/src/routes/signin/index.vue b/src/routes/signin/index.vue
index 3741367..8d9bb85 100644
--- a/src/routes/signin/index.vue
+++ b/src/routes/signin/index.vue
@@ -93,8 +93,14 @@ useHead({
   title: "サインイン | Clean Follow uwuzu",
 });
 
+<<<<<<< HEAD
 if (await isSignin(new Database()))
   useRouter().replace("/");
+=======
+if (await isSignin(new Database())) {
+  useRouter().replace("/");
+}
+>>>>>>> 49ca1fac60aecb94a7d76865c14a673f1ca1eccf
 
 const emit = defineEmits(["failed"]);
 const sprtVer = __CONFIG.uwuzu.supportedVersion;
diff --git a/vite.config.ts b/vite.config.ts
index 4bde436..46df791 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -17,7 +17,11 @@ export default defineConfig({
           min: "1.6.5",
           max: "1.6.10",
         },
+<<<<<<< HEAD
         requiredScopes: ["read:me", "read:users"]
+=======
+        requiredScopes: ["read:me"]
+>>>>>>> 49ca1fac60aecb94a7d76865c14a673f1ca1eccf
       },
     }),
   },