merge conflict fix

.env

@@ -1,2 +1,2 @@
 VITE_API_BASE_URL=http://api.yimaru.yaltopia.com/
-VITE_GOOGLE_CLIENT_ID=google_client_id
+VITE_GOOGLE_CLIENT_ID=

src/pages/auth/LoginPage.tsx

@@ -408,13 +408,15 @@ export function LoginPage() {
           {/* Footer */}
           <div className="mt-10 text-center text-xs text-grayScale-400">
             <p>© {new Date().getFullYear()} Yimaru Academy · All rights reserved</p>
-            <p className="mt-1 font-mono text-[10px] text-grayScale-300">
+          </div>
+        </div>
+      </div>
+
+      {/* Version badge */}
+      <p className="fixed bottom-3 right-4 font-mono text-[10px] text-grayScale-300">
         v{__BUILD_HASH__} · {new Date(__BUILD_TIME__).toLocaleDateString()}
       </p>
     </div>
-        </div>
-      </div>
-    </div>
   );
 }