diff --git a/package-lock.json b/package-lock.json
index a012c1542..3368a1ce5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4697,6 +4697,7 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.29.tgz",
       "integrity": "sha512-ch0qJdr2JY0r04NXSprbK6TXOgnaJ1Tz23fm5W+z0/CBah6BSBc3n96h7K9GOtwh0HrilNWHIBzE1Ko4Dcw/Wg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.2.2"
@@ -5803,6 +5804,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
       "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -6607,6 +6609,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.10.12",
         "caniuse-lite": "^1.0.30001782",
@@ -8163,6 +8166,7 @@
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -8332,6 +8336,7 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -11808,6 +11813,7 @@
       "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -13962,6 +13968,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.12",
         "picocolors": "^1.1.1",
@@ -14132,6 +14139,7 @@
       "resolved": "https://registry.npmjs.org/preact/-/preact-10.29.2.tgz",
       "integrity": "sha512-7tNmwg/7mzzAoB/8kSg6Hl37JraAZw3Z3A0JSY7VXlZwo82Xn0G7wKbNNs2qoF4ZEEsQGTwDAroNdqKs1ofJxQ==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/preact"
@@ -14269,6 +14277,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
       "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -14281,6 +14290,7 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
       "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.2"
@@ -16183,6 +16193,7 @@
       "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -16530,6 +16541,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/src/app/api/metrics/streak/route.ts b/src/app/api/metrics/streak/route.ts
index fd64f5ed9..a0164233b 100644
--- a/src/app/api/metrics/streak/route.ts
+++ b/src/app/api/metrics/streak/route.ts
@@ -1,5 +1,4 @@
 import { getServerSession } from "next-auth";
-import { NextRequest } from "next/server";
 import { authOptions } from "@/lib/auth";
 import { getAccountToken, getAllAccounts } from "@/lib/github-accounts";
 import { GITHUB_API } from "@/lib/github";
@@ -25,10 +24,36 @@ async function fetchActiveDates(
   // stores each account's dates separately and merges them in the GET handler.
   const key = metricsCacheKey(cacheContext.userId, "streak", { githubLogin });
 
+<<<<<<< HEAD
   // withMetricsCache returns cached dates if available within the TTL window,
   // skipping all GitHub API calls below. This is the primary protection against
   // exhausting the Search API rate limit on repeated page loads.
   const dates = await withMetricsCache(
+=======
+function dateDiffDays(a: string, b: string): number {
+  return (
+    (new Date(b).getTime() - new Date(a).getTime()) / (1000 * 60 * 60 * 24)
+  );
+}
+
+function toDateStr(d: Date): string {
+  return d.toISOString().slice(0, 10);
+}
+
+export async function GET() {
+  const session = await getServerSession(authOptions);
+  if (!session?.accessToken || !session.githubLogin || !session.githubId) {
+    return Response.json({ error: "Unauthorized" }, { status: 401 });
+  }
+
+  // Fetch 90 days to calculate a meaningful longest streak
+  const since = new Date();
+  since.setDate(since.getDate() - 90);
+  const sinceStr = since.toISOString().slice(0, 10);
+
+  const searchRes = await fetch(
+    `${GITHUB_API}/search/commits?q=author:${session.githubLogin}+author-date:>=${sinceStr}&per_page=100&sort=author-date&order=asc`,
+>>>>>>> 8c942cb (fix: address PR review — unique constraint, created_at, trailing newlines, revert lockfile)
     {
       bypass: cacheContext.bypass,
       key,
@@ -176,6 +201,7 @@ function calculateStreakFromDates(
     // totalActiveDays counts only days with real commits or freezes in the 90-day window,
     // not the full streak length — useful for the "active days" stat on the dashboard.
     totalActiveDays: commitDays.length,
+<<<<<<< HEAD
     freezeDates: Array.from(freezeDates),
   };
 }
@@ -352,4 +378,7 @@ export async function GET(req: NextRequest) {
   } catch {
     return Response.json({ error: "GitHub API error" }, { status: 502 });
   }
+=======
+  });
+>>>>>>> 8c942cb (fix: address PR review — unique constraint, created_at, trailing newlines, revert lockfile)
 }
diff --git a/src/app/api/streak/freeze/route.ts b/src/app/api/streak/freeze/route.ts
index 317b679f5..5a85e8ccb 100644
--- a/src/app/api/streak/freeze/route.ts
+++ b/src/app/api/streak/freeze/route.ts
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import type { NextRequest } from "next/server";
 import { getServerSession } from "next-auth";
 import { authOptions } from "@/lib/auth";
@@ -9,6 +10,11 @@ import {
   metricsCacheKey,
   withMetricsCache,
 } from "@/lib/metrics-cache";
+=======
+import { getServerSession } from "next-auth";
+import { authOptions } from "@/lib/auth";
+import { supabaseAdmin } from "@/lib/supabase";
+>>>>>>> 1337d90 (feat: add streak freeze feature (#37))
 
 export const dynamic = "force-dynamic";
 
@@ -16,14 +22,24 @@ function todayStr(): string {
   return new Date().toISOString().slice(0, 10);
 }
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 // GET /api/streak/freeze
 // Returns whether the user currently has an unused freeze available.
 export async function GET(req: NextRequest) {
+=======
+=======
+// GET /api/streak/freeze
+>>>>>>> 8c942cb (fix: address PR review — unique constraint, created_at, trailing newlines, revert lockfile)
+// Returns whether the user currently has an unused freeze available.
+export async function GET() {
+>>>>>>> 1337d90 (feat: add streak freeze feature (#37))
   const session = await getServerSession(authOptions);
   if (!session?.githubId) {
     return Response.json({ error: "Unauthorized" }, { status: 401 });
   }
 
+<<<<<<< HEAD
   const user = await resolveAppUser(session.githubId, session.githubLogin);
   if (!user) return Response.json({ error: "User not found" }, { status: 404 });
 
@@ -43,21 +59,45 @@ export async function GET(req: NextRequest) {
 }
 
 async function getFreezeStatus(userId: string) {
+=======
+  const { data: user } = await supabaseAdmin
+    .from("users")
+    .select("id")
+    .eq("github_id", session.githubId)
+    .single();
+
+  if (!user) return Response.json({ error: "User not found" }, { status: 404 });
+
+>>>>>>> 1337d90 (feat: add streak freeze feature (#37))
   const today = todayStr();
 
   const { data: pending } = await supabaseAdmin
     .from("streak_freezes")
     .select("id, freeze_date")
+<<<<<<< HEAD
     .eq("user_id", userId)
+=======
+    .eq("user_id", user.id)
+>>>>>>> 1337d90 (feat: add streak freeze feature (#37))
     .gte("freeze_date", today)
     .limit(1);
 
   const hasFreeze = Array.isArray(pending) && pending.length > 0;
 
+<<<<<<< HEAD
   return { hasFreeze, freezeDate: hasFreeze ? pending![0].freeze_date : null };
 }
 
 // POST /api/streak/freeze
+=======
+  return Response.json({ hasFreeze, freezeDate: hasFreeze ? pending![0].freeze_date : null });
+}
+<<<<<<< HEAD
+>>>>>>> 1337d90 (feat: add streak freeze feature (#37))
+=======
+
+// POST /api/streak/freeze
+>>>>>>> 8c942cb (fix: address PR review — unique constraint, created_at, trailing newlines, revert lockfile)
 // Inserts a freeze for today. Fails if the user already holds an unused freeze.
 export async function POST() {
   const session = await getServerSession(authOptions);
@@ -65,11 +105,22 @@ export async function POST() {
     return Response.json({ error: "Unauthorized" }, { status: 401 });
   }
 
+<<<<<<< HEAD
   const user = await resolveAppUser(session.githubId, session.githubLogin);
+=======
+  const { data: user } = await supabaseAdmin
+    .from("users")
+    .select("id")
+    .eq("github_id", session.githubId)
+    .single();
+
+>>>>>>> 1337d90 (feat: add streak freeze feature (#37))
   if (!user) return Response.json({ error: "User not found" }, { status: 404 });
 
   const today = todayStr();
 
+<<<<<<< HEAD
+<<<<<<< HEAD
   // Prevent users from stockpiling unused freezes
   const { count } = await supabaseAdmin
     .from("streak_freezes")
@@ -86,10 +137,14 @@ export async function POST() {
     );
   }
 
+=======
+  // only 1 unused freeze at a time
+>>>>>>> 1337d90 (feat: add streak freeze feature (#37))
   const { data: existing } = await supabaseAdmin
     .from("streak_freezes")
     .select("id")
     .eq("user_id", user.id)
+<<<<<<< HEAD
     .eq("freeze_date", today)
     .maybeSingle();
 
@@ -99,13 +154,38 @@ export async function POST() {
       { user_id: user.id, freeze_date: today },
       { onConflict: "user_id,freeze_date" }
     )
+=======
+    .gte("freeze_date", today)
+    .limit(1);
+
+  if (Array.isArray(existing) && existing.length > 0) {
+    return Response.json(
+      { error: "You already have an unused streak freeze." },
+      { status: 409 }
+    );
+  }
+
+=======
+>>>>>>> 8c942cb (fix: address PR review — unique constraint, created_at, trailing newlines, revert lockfile)
+  const { data: freeze, error } = await supabaseAdmin
+    .from("streak_freezes")
+    .insert({ user_id: user.id, freeze_date: today })
+>>>>>>> 1337d90 (feat: add streak freeze feature (#37))
     .select()
     .single();
 
   if (error) {
+    // Unique constraint violation — already has a freeze for today
+    if (error.code === "23505") {
+      return Response.json(
+        { error: "You already have an unused streak freeze." },
+        { status: 409 }
+      );
+    }
     return Response.json({ error: "Failed to apply freeze." }, { status: 500 });
   }
 
+<<<<<<< HEAD
   const alreadyExisted = existing !== null;
   const statusCode = alreadyExisted ? 200 : 201;
 
@@ -137,3 +217,10 @@ export async function DELETE() {
 
   return Response.json({ success: true });
 }
+=======
+  return Response.json({ freeze }, { status: 201 });
+}
+<<<<<<< HEAD
+>>>>>>> 1337d90 (feat: add streak freeze feature (#37))
+=======
+>>>>>>> 8c942cb (fix: address PR review — unique constraint, created_at, trailing newlines, revert lockfile)
diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx
index aac71d790..8822a52f7 100644
--- a/src/app/dashboard/page.tsx
+++ b/src/app/dashboard/page.tsx
@@ -102,6 +102,7 @@ export default async function DashboardPage() {
   const session = await getServerSession(authOptions);
   if (!session) redirect("/");
 
+<<<<<<< HEAD
   return (
     <DashboardSSEProvider>
       <div className="min-h-screen bg-[var(--background)] px-4 py-8 text-[var(--foreground)] transition-colors sm:px-6 lg:px-8 max-w-[1600px] mx-auto">
@@ -265,5 +266,46 @@ export default async function DashboardPage() {
         </section>
       </div>
     </DashboardSSEProvider>
+=======
+  if (!session) {
+    redirect("/");
+  }
+
+  return (
+    <div
+      className="min-h-screen bg-[var(--background)] p-4 md:p-8 text-[var(--foreground)] transition-colors"
+    >
+      <DashboardHeader />
+
+      <main id="main-content" aria-label="Developer dashboard">
+        {/* Live region: announces dynamic alerts to screen readers */}
+        <div aria-live="polite" aria-atomic="true" className="sr-only" id="live-announcer" />
+
+        <StreakAtRiskBanner />
+
+        {/* Row 1: Contribution graph + Streak */}
+        <section aria-label="Activity overview" className="grid grid-cols-1 lg:grid-cols-3 gap-6">
+          <div className="lg:col-span-2">
+            <ContributionGraph />
+          </div>
+          <div className="flex flex-col gap-6">
+            <StreakTracker />
+          </div>
+        </section>
+
+        {/* Row 2: PR metrics */}
+        <section aria-label="Pull request analytics" className="mt-6">
+          <PRMetrics />
+        </section>
+
+        {/* Row 3: Top repos + Language breakdown + Goal tracker */}
+        <section aria-label="Repositories, languages, and goals" className="mt-6 grid grid-cols-1 lg:grid-cols-3 gap-6">
+          <TopRepos />
+          <LanguageBreakdown />
+          <GoalTracker />
+        </section>
+      </main>
+    </div>
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
   );
-}
+}
\ No newline at end of file
diff --git a/src/app/dashboard/settings/page.tsx b/src/app/dashboard/settings/page.tsx
index 92b7511d1..bc90a7aac 100644
--- a/src/app/dashboard/settings/page.tsx
+++ b/src/app/dashboard/settings/page.tsx
@@ -1,6 +1,10 @@
 "use client";
 
+<<<<<<< HEAD
 import { Suspense, useEffect, useMemo, useState } from "react";
+=======
+import { useEffect, useRef, useState } from "react";
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
 import { useSession } from "next-auth/react";
 import { redirect, useSearchParams } from "next/navigation";
 import { useHeatmapTheme } from "@/hooks/useHeatmapTheme";
@@ -128,6 +132,7 @@ function SettingsPageContent() {
   const [accountsLoading, setAccountsLoading] = useState(true);
   const [saving, setSaving] = useState(false);
   const [copied, setCopied] = useState(false);
+<<<<<<< HEAD
   const [removeError, setRemoveError] = useState<string | null>(null);
   const [removingAccountId, setRemovingAccountId] = useState<string | null>(
     null
@@ -223,19 +228,18 @@ function SettingsPageContent() {
     setShowConfirmModal(false);
     setPendingPath(null);
   };
+=======
+  const statusRef = useRef<HTMLDivElement>(null);
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
 
-  // Redirect to signin if not authenticated
   useEffect(() => {
     if (status === "unauthenticated") {
       redirect("/");
     }
   }, [status]);
 
-  // Load settings on mount
   useEffect(() => {
-    if (status !== "authenticated" || !session?.githubLogin) {
-      return;
-    }
+    if (status !== "authenticated" || !session?.githubLogin) return;
 
     async function loadSettings() {
       try {
@@ -369,9 +373,20 @@ function SettingsPageContent() {
       if (res.ok) {
         const updated = await res.json();
         setSettings(updated);
+        if (statusRef.current) {
+          statusRef.current.textContent = value
+            ? "Public profile enabled. Your stats are now shareable."
+            : "Public profile disabled. Your stats are now private.";
+        }
       } else {
         console.error("Failed to update settings");
+<<<<<<< HEAD
         toast.error("Failed to update public profile setting");
+=======
+        if (statusRef.current) {
+          statusRef.current.textContent = "Failed to update settings. Please try again.";
+        }
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
       }
     } catch (error) {
       console.error("Error updating settings:", error);
@@ -541,6 +556,7 @@ function SettingsPageContent() {
   const copyShareLink = () => {
     if (!settings) return;
     const link = `${window.location.origin}/u/${settings.github_login}`;
+<<<<<<< HEAD
     navigator.clipboard.writeText(link).then(() => {
       setCopied(true);
       toast.success("Link copied successfully!");
@@ -576,20 +592,29 @@ function SettingsPageContent() {
     } finally {
       setRemovingAccountId(null);
     }
+=======
+    navigator.clipboard.writeText(link);
+    setCopied(true);
+    if (statusRef.current) {
+      statusRef.current.textContent = "Profile link copied to clipboard.";
+    }
+    setTimeout(() => setCopied(false), 2000);
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
   };
 
   if (status === "loading" || loading) {
     return (
       <div className="min-h-screen bg-[var(--background)] p-4 md:p-8 text-[var(--foreground)] transition-colors">
         <div className="max-w-2xl mx-auto">
-          <div className="rounded-xl border border-[var(--border)] bg-[var(--card)] p-6">
+          <div
+            className="rounded-xl border border-[var(--border)] bg-[var(--card)] p-6"
+            role="status"
+            aria-label="Loading settings"
+          >
             <div className="h-8 w-48 bg-[var(--card-muted)] rounded animate-pulse mb-4" />
             <div className="space-y-4">
               {[1, 2, 3].map((i) => (
-                <div
-                  key={i}
-                  className="h-20 bg-[var(--card-muted)] rounded animate-pulse"
-                />
+                <div key={i} className="h-20 bg-[var(--card-muted)] rounded animate-pulse" />
               ))}
             </div>
           </div>
@@ -602,7 +627,7 @@ function SettingsPageContent() {
     return (
       <div className="min-h-screen bg-[var(--background)] p-4 md:p-8 text-[var(--foreground)] transition-colors">
         <div className="max-w-2xl mx-auto">
-          <p className="text-[var(--muted-foreground)]">
+          <p role="alert" className="text-[var(--muted-foreground)]">
             Failed to load settings.
           </p>
         </div>
@@ -610,9 +635,21 @@ function SettingsPageContent() {
     );
   }
 
+  const shareUrl =
+    typeof window !== "undefined"
+      ? `${window.location.origin}/u/${settings.github_login}`
+      : `/u/${settings.github_login}`;
+
   return (
-    <div className="min-h-screen bg-[var(--background)] p-4 md:p-8 text-[var(--foreground)] transition-colors">
+    <div
+      id="main-content"
+      className="min-h-screen bg-[var(--background)] p-4 md:p-8 text-[var(--foreground)] transition-colors"
+    >
+      {/* Live region for status announcements */}
+      <div ref={statusRef} aria-live="polite" aria-atomic="true" className="sr-only" />
+
       <div className="max-w-2xl mx-auto">
+<<<<<<< HEAD
         <div className="mb-6 flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
           <Link href="/dashboard">
             <button aria-label="Back to Dashboard" className="group inline-flex h-10 w-10 items-center justify-center rounded-full border border-[var(--accent)] md:bg-[var(--accent)] md:text-[var(--accent-foreground)] transition-all hover:opacity-90 active:scale-95 md:h-auto md:w-auto md:rounded-lg md:px-4 md:py-2">
@@ -632,6 +669,13 @@ function SettingsPageContent() {
               Manage your profile and preferences
             </p>
           </div>
+=======
+        <div className="mb-8">
+          <h1 className="text-3xl font-bold text-[var(--foreground)]">Settings</h1>
+          <p className="mt-2 text-[var(--muted-foreground)]">
+            Manage your profile and preferences
+          </p>
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
         </div>
 
         {statusMessage && (
@@ -647,17 +691,27 @@ function SettingsPageContent() {
         )}
 
         {/* Public Profile Section */}
-        <div className="rounded-xl border border-[var(--border)] bg-[var(--card)] p-6 shadow-sm">
+        <section
+          aria-labelledby="public-profile-heading"
+          className="rounded-xl border border-[var(--border)] bg-[var(--card)] p-6 shadow-sm"
+        >
           <div className="flex items-start justify-between mb-6 gap-4">
             <div>
-              <h2 className="text-xl font-semibold text-[var(--card-foreground)]">
+              <h2
+                id="public-profile-heading"
+                className="text-xl font-semibold text-[var(--card-foreground)]"
+              >
                 Public Profile
               </h2>
-              <p className="text-sm text-[var(--muted-foreground)] mt-1">
+              <p
+                id="public-profile-desc"
+                className="text-sm text-[var(--muted-foreground)] mt-1"
+              >
                 Share your GitHub stats with a public profile link
               </p>
             </div>
 
+<<<<<<< HEAD
             {/* Toggle Switch */}
             <label className="flex items-center cursor-pointer select-none">
               <div className="relative">
@@ -681,6 +735,40 @@ function SettingsPageContent() {
                 />
               </div>
             </label>
+=======
+            {/* Accessible Toggle Switch */}
+            <div className="flex items-center gap-3">
+              <span
+                id="public-toggle-label"
+                className="text-sm text-[var(--muted-foreground)] select-none"
+              >
+                {settings.is_public ? "On" : "Off"}
+              </span>
+              <button
+                type="button"
+                role="switch"
+                aria-checked={settings.is_public}
+                aria-labelledby="public-toggle-label"
+                aria-describedby="public-profile-desc"
+                disabled={saving}
+                aria-busy={saving}
+                onClick={() => handleTogglePublic(!settings.is_public)}
+                className={`relative inline-flex h-6 w-10 cursor-pointer items-center rounded-full transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--accent)] disabled:cursor-not-allowed disabled:opacity-60 ${
+                  settings.is_public ? "bg-[var(--accent)]" : "bg-[var(--control)]"
+                }`}
+              >
+                <span className="sr-only">
+                  {settings.is_public ? "Disable public profile" : "Enable public profile"}
+                </span>
+                <span
+                  aria-hidden="true"
+                  className={`inline-block h-4 w-4 transform rounded-full bg-white shadow transition-transform ${
+                    settings.is_public ? "translate-x-5" : "translate-x-1"
+                  }`}
+                />
+              </button>
+            </div>
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
           </div>
 
           {/* Share Link Section */}
@@ -690,16 +778,25 @@ function SettingsPageContent() {
                 Share Your Profile
               </h3>
               <div className="flex gap-2">
+                <label htmlFor="share-url" className="sr-only">
+                  Your public profile URL
+                </label>
                 <input
+                  id="share-url"
                   type="text"
-                  value={`${window.location.origin}/u/${settings.github_login}`}
+                  value={shareUrl}
                   readOnly
-                  className="flex-1 rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-2 text-sm text-[var(--card-foreground)] focus:outline-none"
+                  aria-label="Your public profile URL"
+                  className="flex-1 rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-2 text-sm text-[var(--card-foreground)] focus:outline-none focus-visible:outline focus-visible:outline-2 focus-visible:outline-[var(--accent)]"
                 />
                 <button
                   type="button"
                   onClick={copyShareLink}
+<<<<<<< HEAD
                   aria-label="Copy profile URL"
+=======
+                  aria-label={copied ? "Link copied to clipboard" : "Copy profile link to clipboard"}
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
                   className="px-4 py-2 rounded-lg bg-[var(--accent)] text-[var(--accent-foreground)] text-sm font-medium hover:opacity-90 transition-opacity"
                 >
                   {copied ? "Copied!" : "Copy"}
@@ -878,6 +975,7 @@ function SettingsPageContent() {
               </p>
             </div>
           )}
+<<<<<<< HEAD
 
           {isDirty && (
             <div className="mt-6 pt-6 border-t border-[var(--border)] flex justify-end">
@@ -1353,3 +1451,10 @@ export default function SettingsPage() {
     </Suspense>
   );
 }
+=======
+        </section>
+      </div>
+    </div>
+  );
+}
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
diff --git a/src/app/error.tsx b/src/app/error.tsx
index 962b06e4c..1aaf4c804 100644
--- a/src/app/error.tsx
+++ b/src/app/error.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useEffect } from "react";
-import { getSafeErrorMessage } from "@/lib/error-utils";
+import Link from "next/link";
 
 export default function Error({
   error,
@@ -11,23 +11,23 @@ export default function Error({
   reset: () => void;
 }) {
   useEffect(() => {
-    if (process.env.NODE_ENV !== "production") {
-      console.error(error);
-    }
+    // Log to console in all envs; swap console.error for Sentry.captureException if needed
+    console.error("[DevTrack] Application error:", error);
   }, [error]);
 
   return (
     <div className="flex min-h-screen flex-col items-center justify-center bg-[var(--background)] px-4 text-center">
       <div className="w-full max-w-md rounded-xl border border-[var(--border)] bg-[var(--card)] p-8 shadow-sm">
+        {/* Icon */}
         <div className="mb-6 flex justify-center">
-          <div className="flex h-20 w-20 items-center justify-center rounded-full bg-[var(--accent-soft)] text-[var(--accent)]">
+          <div className="flex h-20 w-20 items-center justify-center rounded-full bg-[var(--accent-soft)]">
             <svg
               xmlns="http://www.w3.org/2000/svg"
               fill="none"
               viewBox="0 0 24 24"
               strokeWidth={1.5}
               stroke="currentColor"
-              className="h-10 w-10"
+              className="h-10 w-10 text-[var(--accent)]"
               aria-hidden="true"
             >
               <path
@@ -38,24 +38,46 @@ export default function Error({
             </svg>
           </div>
         </div>
+
+        {/* Branding */}
+        <p className="mb-1 text-xs font-semibold uppercase tracking-widest text-[var(--accent)]">
+          DevTrack · 500
+        </p>
+
         <h1 className="mb-2 text-2xl font-bold text-[var(--card-foreground)]">
           Something went wrong
         </h1>
-        <p className="mb-6 text-sm text-[var(--muted-foreground)]">
-          {getSafeErrorMessage(error)}
+        <p className="mb-6 text-sm leading-relaxed text-[var(--muted-foreground)]">
+          An unexpected server error occurred. Our team has been notified. You
+          can try again or head back to the dashboard.
         </p>
+
+        {/* Error digest for support */}
         {error.digest && (
-          <p className="mb-4 text-xs text-[var(--muted-foreground)]">
-            Error ID: <code className="font-mono">{error.digest}</code>
+          <p className="mb-6 text-xs text-[var(--muted-foreground)]">
+            Error ID:{" "}
+            <code className="rounded bg-[var(--control)] px-1.5 py-0.5 font-mono text-[var(--card-foreground)]">
+              {error.digest}
+            </code>
           </p>
         )}
-        <button
-          onClick={reset}
-          className="inline-flex w-full items-center justify-center rounded-lg bg-[var(--accent)] px-4 py-2.5 text-sm font-medium text-[var(--accent-foreground)] transition-opacity hover:opacity-90"
-        >
-          Try again
-        </button>
+
+        {/* Actions */}
+        <div className="flex flex-col gap-3">
+          <button
+            onClick={reset}
+            className="inline-flex w-full items-center justify-center rounded-lg bg-[var(--accent)] px-4 py-2.5 text-sm font-semibold text-[var(--accent-foreground)] transition-opacity hover:opacity-90 active:scale-[0.98]"
+          >
+            Try Again
+          </button>
+          <Link
+            href="/dashboard"
+            className="inline-flex w-full items-center justify-center rounded-lg border border-[var(--border)] bg-[var(--card)] px-4 py-2.5 text-sm font-semibold text-[var(--card-foreground)] transition-all hover:bg-[var(--control)] active:scale-[0.98]"
+          >
+            Go to Dashboard
+          </Link>
+        </div>
       </div>
     </div>
   );
-}
+}
\ No newline at end of file
diff --git a/src/app/globals.css b/src/app/globals.css
index e85566853..9cb4190ee 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -22,12 +22,17 @@
   --control: #f1f5f9;
   --control-hover: #e2e8f0;
   --tooltip: #ffffff;
+<<<<<<< HEAD
   --tooltip-foreground: #111827;
   --destructive-muted: rgba(239, 68, 68, 0.1);
   --destructive-muted-border: rgba(239, 68, 68, 0.3);
   --destructive-foreground: #ffffff;
   --shadow-soft: 0 12px 30px -20px rgba(37, 99, 235, 0.35);
   --shadow-medium: 0 18px 35px -24px rgba(37, 99, 235, 0.4);
+=======
+  --tooltip-foreground: #0f172a;
+  --focus-ring: #6366f1;
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
 }
 
 .dark {
@@ -56,6 +61,7 @@
   --control-hover: #344a67;
   --tooltip: #1a2538;
   --tooltip-foreground: #f8fafc;
+<<<<<<< HEAD
   --destructive-muted: rgba(248, 113, 113, 0.1);
   --destructive-muted-border: rgba(248, 113, 113, 0.3);
   --destructive-foreground: #ffffff;
@@ -77,6 +83,9 @@ body:has(.lnd-root) {
 body:has(.wrapped-root) {
   background: #020817 !important;
   background-color: #020817 !important;
+=======
+  --focus-ring: #818cf8;
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
 }
 
 body {
@@ -353,3 +362,28 @@ body {
 .animate-shimmer {
   animation: shimmer 1.5s infinite;
 }
+
+/* ── Global focus styles (WCAG 2.1 AA) ── */
+/* Visible focus ring for all interactive elements */
+:focus-visible {
+  outline: 3px solid var(--focus-ring);
+  outline-offset: 2px;
+  border-radius: 4px;
+}
+
+/* Skip-to-content link – visually hidden until focused */
+.skip-link {
+  position: absolute;
+  top: -999px;
+  left: 0;
+  z-index: 9999;
+  padding: 0.5rem 1rem;
+  background: var(--accent);
+  color: var(--accent-foreground);
+  font-weight: 600;
+  border-radius: 0 0 4px 0;
+  text-decoration: none;
+}
+.skip-link:focus {
+  top: 0;
+}
\ No newline at end of file
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 2bc501382..6c9533d8c 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -56,6 +56,7 @@ export default async function RootLayout({
   children: React.ReactNode;
 }) {
   return (
+<<<<<<< HEAD
     <html lang="en" suppressHydrationWarning>
       <head>
         <script
@@ -97,7 +98,16 @@ export default async function RootLayout({
           <Toaster richColors position="top-right" />
         </div>
         <DeferredVercelMetrics />
+=======
+    <html lang="en" className="dark" suppressHydrationWarning>
+      <body className={inter.className}>
+        {/* Skip-to-content link for keyboard/screen-reader users */}
+        <a href="#main-content" className="skip-link">
+          Skip to main content
+        </a>
+        <Providers>{children}</Providers>
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
       </body>
     </html>
   );
-}
+}
\ No newline at end of file
diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx
index 57e6ba7e5..546d71727 100644
--- a/src/app/not-found.tsx
+++ b/src/app/not-found.tsx
@@ -2,35 +2,45 @@ import Link from "next/link";
 
 export default function NotFound() {
   return (
-    <div className="flex min-h-[75vh] flex-col items-center justify-center px-4 text-center">
-      <div className="relative flex flex-col items-center justify-center">
-        {/* Branded 404 code */}
-        <h1 className="text-9xl font-extrabold tracking-widest text-[var(--accent)] drop-shadow-md selection:bg-transparent">
-          404
-        </h1>
-        <div className="absolute rotate-12 rounded bg-[var(--accent)] px-2.5 py-1 text-xs font-bold uppercase tracking-wider text-[var(--accent-foreground)] shadow-md inline-block selection:bg-transparent">
-          Page Not Found
+    <div className="flex min-h-screen flex-col items-center justify-center bg-[var(--background)] px-4 text-center">
+      <div className="w-full max-w-lg">
+        {/* Branding */}
+        <p className="mb-6 text-sm font-semibold uppercase tracking-widest text-[var(--accent)]">
+          DevTrack
+        </p>
+
+        {/* 404 number */}
+        <div className="relative inline-block">
+          <h1 className="text-[10rem] font-extrabold leading-none tracking-tight text-[var(--accent)] opacity-20 select-none">
+            404
+          </h1>
+          <div className="absolute inset-0 flex items-center justify-center">
+            <span className="rounded-full bg-[var(--accent-soft)] px-4 py-1.5 text-xs font-bold uppercase tracking-widest text-[var(--accent)]">
+              Page Not Found
+            </span>
+          </div>
         </div>
-      </div>
 
-      <div className="mt-8 max-w-md">
-        <h2 className="text-2xl font-bold md:text-3xl text-[var(--card-foreground)]">
-          Lost in space?
+        {/* Message */}
+        <h2 className="mt-4 text-2xl font-bold text-[var(--card-foreground)] md:text-3xl">
+          Oops! This page doesn&apos;t exist.
         </h2>
-        <p className="mt-4 text-sm text-[var(--muted-foreground)] leading-relaxed">
-          The page you are looking for might have been removed, had its name changed, or is temporarily unavailable. Let&apos;s get you back on track!
+        <p className="mt-3 text-sm leading-relaxed text-[var(--muted-foreground)]">
+          The page you&apos;re looking for may have been moved, renamed, or
+          never existed. Let&apos;s get you back on track.
         </p>
 
-        <div className="mt-8 flex flex-wrap items-center justify-center gap-4">
+        {/* Actions */}
+        <div className="mt-8 flex flex-wrap items-center justify-center gap-3">
           <Link
             href="/dashboard"
-            className="rounded-lg bg-[var(--accent)] px-6 py-3 text-sm font-semibold text-[var(--accent-foreground)] shadow-lg transition-all hover:opacity-95 active:scale-[0.98]"
+            className="rounded-lg bg-[var(--accent)] px-6 py-3 text-sm font-semibold text-[var(--accent-foreground)] shadow-md transition-all hover:opacity-90 active:scale-[0.98]"
           >
-            Go to Dashboard
+            Go Back to Dashboard
           </Link>
           <Link
             href="/"
-            className="rounded-lg border border-[var(--border)] bg-[var(--control)] px-6 py-3 text-sm font-semibold text-[var(--card-foreground)] transition-all hover:bg-[var(--accent)]/10 active:scale-[0.98]"
+            className="rounded-lg border border-[var(--border)] bg-[var(--card)] px-6 py-3 text-sm font-semibold text-[var(--card-foreground)] transition-all hover:bg-[var(--control)] active:scale-[0.98]"
           >
             Go Home
           </Link>
@@ -38,4 +48,4 @@ export default function NotFound() {
       </div>
     </div>
   );
-}
+}
\ No newline at end of file
diff --git a/src/app/page.tsx b/src/app/page.tsx
index d298bc64f..1b8f72d49 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -109,8 +109,47 @@ export default async function HomePage() {
   const stats = await fetchRepoStats();
 
   return (
+<<<<<<< HEAD
     <div className={`${syne.variable} ${dmSans.variable} ${jetbrains.variable}`}>
       <LandingPage repoStats={stats} />
     </div>
+=======
+    <main
+      id="main-content"
+      className="min-h-screen flex flex-col items-center justify-center px-4"
+      aria-label="DevTrack home page"
+    >
+      <div className="max-w-2xl text-center">
+        <h1 className="text-5xl font-bold mb-4 text-white">DevTrack</h1>
+        <p className="text-xl text-slate-400 mb-8">
+          Open-source developer productivity dashboard. Track coding habits,
+          visualize GitHub contributions, and hit your goals.
+        </p>
+        <nav aria-label="Primary actions">
+          <ul className="flex gap-4 justify-center list-none p-0 m-0">
+            <li>
+              <Link
+                href="/api/auth/signin/github?callbackUrl=/dashboard"
+                className="bg-white text-slate-900 px-6 py-3 rounded-lg font-semibold hover:bg-slate-100 transition focus-visible:outline focus-visible:outline-3 focus-visible:outline-offset-2 focus-visible:outline-white"
+              >
+                Sign in with GitHub
+              </Link>
+            </li>
+            <li>
+              <a
+                href="https://github.com/Priyanshu-byte-coder/devtrack"
+                target="_blank"
+                rel="noopener noreferrer"
+                aria-label="View DevTrack source code on GitHub (opens in new tab)"
+                className="border border-slate-600 text-white px-6 py-3 rounded-lg font-semibold hover:border-slate-400 transition"
+              >
+                View on GitHub
+              </a>
+            </li>
+          </ul>
+        </nav>
+      </div>
+    </main>
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
   );
-}
+}
\ No newline at end of file
diff --git a/src/components/ContributionGraph.tsx b/src/components/ContributionGraph.tsx
index 3fd5db119..3e0f26d44 100644
--- a/src/components/ContributionGraph.tsx
+++ b/src/components/ContributionGraph.tsx
@@ -1,9 +1,12 @@
 "use client";
 
 import { useEffect, useRef, useState } from "react";
+<<<<<<< HEAD
 import { useAccount } from "@/components/AccountContext";
 import CommitSearchPanel from "@/components/CommitSearchPanel";
 import type { CommitItem } from "@/lib/github";
+=======
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
 import {
   BarChart,
   Bar,
@@ -110,6 +113,7 @@ export default function ContributionGraph() {
   const [loading, setLoading] = useState(true);
   const [days, setDays] = useState(30);
   const [chartType, setChartType] = useState<ViewMode>("bar");
+<<<<<<< HEAD
   const [lastUpdated, setLastUpdated] = useState<Date | null>(null);
   const [minutesAgo, setMinutesAgo] = useState(0);
   const [error, setError] = useState<string | null>(null);
@@ -174,6 +178,9 @@ export default function ContributionGraph() {
       } catch { }
     }
   };
+=======
+  const announcerRef = useRef<HTMLDivElement>(null);
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
 
   useEffect(() => {
     setLoading(true);
@@ -249,7 +256,15 @@ export default function ContributionGraph() {
         const sorted = Object.entries(res.data ?? {})
           .sort(([a], [b]) => a.localeCompare(b))
           .map(([day, commits]) => ({ day, commits }));
+<<<<<<< HEAD
         setFriendData(sorted);
+=======
+        setData(sorted);
+        if (announcerRef.current) {
+          const total = sorted.reduce((sum, d) => sum + d.commits, 0);
+          announcerRef.current.textContent = `Commit activity chart updated: ${total} commits over the last ${days} days.`;
+        }
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
       })
       .catch(() => {
         setCompareError("Failed to load friend data");
@@ -378,7 +393,10 @@ export default function ContributionGraph() {
   const hasFriendData = compareMode && friendData.length > 0 && !compareError;
   const tooltipTrigger = usesTouchTooltip ? "click" : "hover";
 
+  const totalCommits = data.reduce((sum, d) => sum + d.commits, 0);
+
   return (
+<<<<<<< HEAD
     <div
       id="contribution-activity"
       className="rounded-xl border border-[var(--border)] bg-[var(--card)] p-6 shadow-sm"
@@ -423,12 +441,48 @@ export default function ContributionGraph() {
                   ? "bg-[var(--accent)] text-[var(--background)]"
                   : "text-[var(--muted-foreground)] hover:text-[var(--foreground)]"
                   }`}
+=======
+    <section
+      aria-labelledby="commit-activity-heading"
+      className="rounded-xl border border-[var(--border)] bg-[var(--card)] p-6 shadow-sm"
+    >
+      {/* Live region for dynamic updates */}
+      <div ref={announcerRef} aria-live="polite" aria-atomic="true" className="sr-only" />
+
+      <div className="flex flex-wrap items-center justify-between mb-4 gap-2">
+        <h2
+          id="commit-activity-heading"
+          className="text-lg font-semibold text-[var(--card-foreground)]"
+        >
+          Commit Activity
+        </h2>
+
+        <div className="flex flex-wrap items-center gap-2">
+          {/* Range selector */}
+          <div
+            className="flex gap-1 rounded-lg bg-[var(--control)] p-1"
+            role="group"
+            aria-label="Select date range"
+          >
+            {RANGES.map((r) => (
+              <button
+                key={r.days}
+                onClick={() => setDays(r.days)}
+                aria-pressed={days === r.days}
+                aria-label={`Show last ${r.label}`}
+                className={`px-3 py-1 rounded-md text-sm font-medium transition-colors ${
+                  days === r.days
+                    ? "bg-[var(--accent)] text-[var(--accent-foreground)]"
+                    : "text-[var(--muted-foreground)] hover:text-[var(--card-foreground)]"
+                }`}
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
               >
                 {r.label}
               </button>
             ))}
           </div>
 
+<<<<<<< HEAD
           {/* Custom date range */}
           <div className="relative" ref={popoverRef}>
             <button
@@ -508,6 +562,14 @@ export default function ContributionGraph() {
               role="group"
               aria-label="Chart type"
               className="flex gap-1 rounded-lg border border-[var(--border)] bg-[var(--background)] p-1 text-sm"
+=======
+          {/* Chart type toggle */}
+          {data.length > 0 && (
+            <div
+              className="flex gap-1 rounded-lg bg-[var(--control)] p-1 text-sm"
+              role="group"
+              aria-label="Select chart type"
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
             >
               {charts.map((chart) => (
                 <button
@@ -515,10 +577,19 @@ export default function ContributionGraph() {
                   type="button"
                   onClick={() => setChartType(chart.key)}
                   aria-pressed={chartType === chart.key}
+<<<<<<< HEAD
                   className={`px-3 py-1 rounded-md transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-indigo-500 ${chartType === chart.key
                     ? "bg-[var(--accent)] text-[var(--background)]"
                     : "text-[var(--muted-foreground)] hover:text-[var(--foreground)]"
                     }`}
+=======
+                  aria-label={`${chart.label} chart`}
+                  className={`px-3 py-1 rounded-md transition-colors duration-200 ${
+                    chartType === chart.key
+                      ? "bg-[var(--accent)] text-[var(--accent-foreground)]"
+                      : "text-[var(--muted-foreground)] hover:text-[var(--card-foreground)]"
+                  }`}
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
                 >
                   {chart.label}
                 </button>
@@ -541,6 +612,7 @@ export default function ContributionGraph() {
 
       {loading ? (
         <div
+<<<<<<< HEAD
           role="status"
           aria-live="polite"
           aria-busy="true"
@@ -577,10 +649,41 @@ export default function ContributionGraph() {
                   contentStyle={{
                     background: "var(--card)",
                     color: "var(--foreground)",
+=======
+          className="h-[200px] rounded bg-[var(--card-muted)] animate-pulse"
+          role="status"
+          aria-label="Loading commit activity chart"
+        />
+      ) : data.length === 0 ? (
+        <p
+          className="flex h-[200px] items-center text-sm text-[var(--muted-foreground)]"
+          role="status"
+        >
+          No commits in the last {days} days.
+        </p>
+      ) : (
+        <>
+          {/* Accessible text summary for screen readers */}
+          <p className="sr-only">
+            {chartType === "bar" ? "Bar" : "Line"} chart showing {totalCommits} total
+            commits over the last {days} days.
+          </p>
+          <ResponsiveContainer width="100%" height={200}>
+            {chartType === "bar" ? (
+              <BarChart data={data} aria-label={`Bar chart: ${totalCommits} commits in last ${days} days`}>
+                <CartesianGrid strokeDasharray="3 3" stroke="var(--border)" />
+                <XAxis dataKey="day" hide />
+                <YAxis stroke="var(--muted-foreground)" allowDecimals={false} />
+                <Tooltip
+                  contentStyle={{
+                    background: "var(--tooltip)",
+                    color: "var(--tooltip-foreground)",
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
                     border: "1px solid var(--border)",
                     borderRadius: "8px",
                   }}
                   labelStyle={{
+<<<<<<< HEAD
                     color: "var(--foreground)",
                     fontSize: "12px",
                   }}
@@ -679,10 +782,34 @@ export default function ContributionGraph() {
                   contentStyle={{
                     background: "var(--card)",
                     color: "var(--foreground)",
+=======
+                    color: "var(--tooltip-foreground)",
+                    fontSize: "12px",
+                  }}
+                  cursor={{ fill: "var(--card-muted)" }}
+                />
+                <Bar
+                  dataKey="commits"
+                  fill="var(--accent)"
+                  radius={[4, 4, 0, 0]}
+                  name="Commits"
+                />
+              </BarChart>
+            ) : (
+              <LineChart data={data} aria-label={`Line chart: ${totalCommits} commits in last ${days} days`}>
+                <CartesianGrid strokeDasharray="3 3" stroke="var(--border)" />
+                <XAxis dataKey="day" hide />
+                <YAxis stroke="var(--muted-foreground)" allowDecimals={false} />
+                <Tooltip
+                  contentStyle={{
+                    background: "var(--tooltip)",
+                    color: "var(--tooltip-foreground)",
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
                     border: "1px solid var(--border)",
                     borderRadius: "8px",
                   }}
                   labelStyle={{
+<<<<<<< HEAD
                     color: "var(--foreground)",
                     fontSize: "12px",
                   }}
@@ -741,7 +868,26 @@ export default function ContributionGraph() {
 
       {!compareMode && (
         <CommitSearchPanel commits={commits} loading={loading} />
+=======
+                    color: "var(--tooltip-foreground)",
+                    fontSize: "12px",
+                  }}
+                  cursor={{ fill: "var(--card-muted)" }}
+                />
+                <Line
+                  type="monotone"
+                  dataKey="commits"
+                  stroke="var(--accent)"
+                  strokeWidth={2}
+                  dot={false}
+                  name="Commits"
+                />
+              </LineChart>
+            )}
+          </ResponsiveContainer>
+        </>
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
       )}
-    </div>
+    </section>
   );
 }
diff --git a/src/components/DashboardHeader.tsx b/src/components/DashboardHeader.tsx
index ef576eebc..d4942607c 100644
--- a/src/components/DashboardHeader.tsx
+++ b/src/components/DashboardHeader.tsx
@@ -152,6 +152,7 @@ export default function DashboardHeader() {
     : null;
 
   return (
+<<<<<<< HEAD
     <header className="relative mb-8 overflow-hidden rounded-3xl border border-[var(--border)] bg-[var(--card)]/95 p-5 shadow-[var(--shadow-soft)] backdrop-blur-md transition-all duration-300 hover:shadow-[var(--shadow-medium)] md:p-6">
       <div className="pointer-events-none absolute inset-x-0 top-0 h-px bg-gradient-to-r from-transparent via-[var(--accent)]/40 to-transparent" />
       <div className="pointer-events-none absolute -right-10 -top-12 h-32 w-32 rounded-full bg-[var(--accent)]/10 blur-3xl" />
@@ -230,6 +231,37 @@ export default function DashboardHeader() {
       <div className="mt-5">
         <AccountToggle />
       </div>
+=======
+    <header
+      className="flex flex-wrap items-center justify-between p-4 mb-8 gap-3 border-b border-[var(--border)] pb-6"
+      role="banner"
+    >
+      <div>
+        <h1 className="text-2xl md:text-3xl font-bold text-[var(--foreground)]">
+          Dashboard
+        </h1>
+        <p className="mt-1 text-[var(--muted-foreground)]">
+          Your coding activity at a glance
+        </p>
+      </div>
+
+      <nav aria-label="User actions" className="flex flex-wrap items-center gap-3">
+        {settings?.is_public && session?.githubLogin && (
+          <a
+            href={`/u/${session.githubLogin}`}
+            target="_blank"
+            rel="noopener noreferrer"
+            aria-label="View your public profile (opens in new tab)"
+            className="px-3 py-2 rounded-lg border border-[var(--border)] bg-[var(--control)] text-[var(--card-foreground)] text-sm font-medium hover:bg-[var(--accent)] hover:text-[var(--accent-foreground)] transition-colors"
+          >
+            Share Profile
+          </a>
+        )}
+        <UserAvatar />
+        <ThemeToggle />
+        <SignOutButton />
+      </nav>
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
     </header>
   );
-}
+}
\ No newline at end of file
diff --git a/src/components/ErrorBoundary.tsx b/src/components/ErrorBoundary.tsx
new file mode 100644
index 000000000..66bab633d
--- /dev/null
+++ b/src/components/ErrorBoundary.tsx
@@ -0,0 +1,89 @@
+"use client";
+
+import React from "react";
+
+interface Props {
+  children: React.ReactNode;
+  /** Optional section name shown in the error card, e.g. "Contribution Graph" */
+  section?: string;
+}
+
+interface State {
+  hasError: boolean;
+  error: Error | null;
+}
+
+export class ErrorBoundary extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+    this.state = { hasError: false, error: null };
+  }
+
+  static getDerivedStateFromError(error: Error): State {
+    return { hasError: true, error };
+  }
+
+  componentDidCatch(error: Error, info: React.ErrorInfo) {
+    // Log to console; replace with Sentry.captureException(error, { extra: info }) if needed
+    console.error(
+      `[DevTrack ErrorBoundary]${this.props.section ? ` [${this.props.section}]` : ""}`,
+      error,
+      info.componentStack,
+    );
+  }
+
+  handleReset = () => {
+    this.setState({ hasError: false, error: null });
+  };
+
+  render() {
+    if (this.state.hasError) {
+      return (
+        <div
+          role="alert"
+          className="flex flex-col items-center justify-center gap-3 rounded-xl border border-[var(--border)] bg-[var(--card)] p-6 text-center shadow-sm"
+        >
+          {/* Icon */}
+          <div className="flex h-12 w-12 items-center justify-center rounded-full bg-[var(--accent-soft)]">
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              fill="none"
+              viewBox="0 0 24 24"
+              strokeWidth={1.5}
+              stroke="currentColor"
+              className="h-6 w-6 text-[var(--accent)]"
+              aria-hidden="true"
+            >
+              <path
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
+              />
+            </svg>
+          </div>
+
+          <div>
+            <p className="text-sm font-semibold text-[var(--card-foreground)]">
+              {this.props.section
+                ? `${this.props.section} failed to load`
+                : "Something went wrong here"}
+            </p>
+            <p className="mt-1 text-xs text-[var(--muted-foreground)]">
+              Try refreshing this section. If the problem persists, reload the
+              page.
+            </p>
+          </div>
+
+          <button
+            onClick={this.handleReset}
+            className="mt-1 rounded-md bg-[var(--accent)] px-4 py-1.5 text-xs font-semibold text-[var(--accent-foreground)] transition-opacity hover:opacity-90 active:scale-[0.98]"
+          >
+            Try Again
+          </button>
+        </div>
+      );
+    }
+
+    return this.props.children;
+  }
+}
\ No newline at end of file
diff --git a/src/components/GoalTracker.tsx b/src/components/GoalTracker.tsx
index 83920c352..a503e280a 100644
--- a/src/components/GoalTracker.tsx
+++ b/src/components/GoalTracker.tsx
@@ -1,9 +1,14 @@
 "use client";
 
+<<<<<<< HEAD
 import { useCallback, useEffect, useState, useRef } from "react";
 import { submitGoalWithRefresh } from "@/lib/goal-tracker";
 
 type Recurrence = "none" | "weekly" | "monthly";
+=======
+import { useCallback, useEffect, useRef, useState } from "react";
+import { stripHtml } from "@/lib/sanitize";
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
 
 interface Goal {
   id: string;
@@ -36,6 +41,7 @@ export default function GoalTracker() {
   const [recurrence, setRecurrence] = useState<Recurrence>("none");
   const [deadline, setDeadline] = useState("");
   const [creating, setCreating] = useState(false);
+<<<<<<< HEAD
   const [createError, setCreateError] = useState<string | null>(null);
   const [confirmingId, setConfirmingId] = useState<string | null>(null);
   const [deletingId, setDeletingId] = useState<string | null>(null);
@@ -44,6 +50,9 @@ export default function GoalTracker() {
   const [activeConfettiGoalId, setActiveConfettiGoalId] = useState<string | null>(null);
   const prevGoalsRef = useRef<Map<string, boolean>>(new Map());
   const initialLoadDoneRef = useRef<boolean>(false);
+=======
+  const statusRef = useRef<HTMLDivElement>(null);
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
 
   const loadGoals = useCallback(async () => {
     const response = await fetch("/api/goals");
@@ -128,7 +137,16 @@ export default function GoalTracker() {
   async function handleCreate(e: React.FormEvent) {
     e.preventDefault();
     setCreating(true);
+<<<<<<< HEAD
     setCreateError(null);
+=======
+
+    const sanitizedLabel = stripHtml(label).slice(0, 100);
+    if (!sanitizedLabel) {
+      setCreating(false);
+      return;
+    }
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
 
     try {
       const result = await submitGoalWithRefresh({
@@ -144,6 +162,7 @@ export default function GoalTracker() {
 
       setTitle("");
       setTarget(7);
+<<<<<<< HEAD
       setUnit("commits");
       setRecurrence("none");
       setDeadline("");
@@ -156,6 +175,13 @@ export default function GoalTracker() {
       }
     } catch {
       setCreateError("Failed to create goal. Please try again.");
+=======
+      await loadGoals();
+
+      if (statusRef.current) {
+        statusRef.current.textContent = `Goal "${sanitizedLabel}" added successfully.`;
+      }
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
     } finally {
       setCreating(false);  
     }
@@ -241,6 +267,7 @@ export default function GoalTracker() {
 
   if (loading) {
     return (
+<<<<<<< HEAD
       <div className="h-full rounded-xl border border-[var(--border)] bg-[var(--card)] p-4 sm:p-6 shadow-sm">
         <div role="status" aria-live="polite" aria-busy="true">
           <span className="sr-only">Loading weekly goals</span>
@@ -255,11 +282,26 @@ export default function GoalTracker() {
             </div>
           ))}
         </div>
+=======
+      <div
+        className="h-full rounded-xl border border-[var(--border)] bg-[var(--card)] p-6"
+        role="status"
+        aria-label="Loading weekly goals"
+      >
+        <div className="mb-4 h-5 w-32 rounded bg-[var(--card-muted)] animate-pulse" />
+        {[1, 2, 3].map((i) => (
+          <div key={i} className="mb-4">
+            <div className="mb-2 h-3 rounded bg-[var(--card-muted)] animate-pulse" />
+            <div className="h-2 rounded bg-[var(--card-muted)] animate-pulse" />
+          </div>
+        ))}
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
       </div>
     );
   }
 
   return (
+<<<<<<< HEAD
     <div className="h-full rounded-xl border border-[var(--border)] bg-[var(--card)] p-4 sm:p-6 shadow-sm">
       {/* ── Header ── */}
       <div className="flex items-center justify-between mb-4">
@@ -314,11 +356,31 @@ export default function GoalTracker() {
       {goals.length === 0 ? (
         <p className="text-sm text-[var(--muted-foreground)]">
           No goals yet. Create one below.
+=======
+    <section
+      aria-labelledby="weekly-goals-heading"
+      className="h-full rounded-xl border border-[var(--border)] bg-[var(--card)] p-6 shadow-sm"
+    >
+      {/* Live region for goal creation feedback */}
+      <div ref={statusRef} aria-live="polite" aria-atomic="true" className="sr-only" />
+
+      <h2
+        id="weekly-goals-heading"
+        className="mb-4 text-lg font-semibold text-[var(--card-foreground)]"
+      >
+        Weekly Goals
+      </h2>
+
+      {goals.length === 0 ? (
+        <p className="text-sm text-[var(--muted-foreground)]">
+          No goals yet. Add one using the form below.
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
         </p>
       ) : (
-        <ul className="space-y-4">
+        <ul className="space-y-4" aria-label="Your weekly goals">
           {goals.map((goal) => {
             const pct = Math.min((goal.current / goal.target) * 100, 100);
+<<<<<<< HEAD
             const isConfirming = confirmingId === goal.id;
             const isDeleting = deletingId === goal.id;
             const completed = goal.current >= goal.target;
@@ -443,6 +505,35 @@ export default function GoalTracker() {
                 </div>
 
                 <div className="h-2 overflow-hidden rounded-full bg-[var(--control)]">
+=======
+            const safeLabel = stripHtml(goal.label);
+            const progressId = `progress-${goal.id}`;
+            return (
+              <li key={goal.id}>
+                <div className="flex justify-between text-sm mb-1">
+                  <span
+                    id={progressId}
+                    className="text-[var(--card-foreground)]"
+                  >
+                    {safeLabel}
+                  </span>
+                  <span
+                    className="text-[var(--muted-foreground)]"
+                    aria-label={`${goal.current} of ${goal.target} completed`}
+                  >
+                    {goal.current}/{goal.target}
+                  </span>
+                </div>
+                <div
+                  role="progressbar"
+                  aria-valuenow={Math.round(pct)}
+                  aria-valuemin={0}
+                  aria-valuemax={100}
+                  aria-labelledby={progressId}
+                  aria-label={`${safeLabel}: ${Math.round(pct)}% complete`}
+                  className="h-2 overflow-hidden rounded-full bg-[var(--control)]"
+                >
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
                   <div
                     className={`h-full rounded-full transition-all ${completed ? "bg-emerald-500" : "bg-[var(--accent)]"}`}
                     style={{ width: `${Math.max(0, Math.min(pct, 100))}%` }}
@@ -455,6 +546,7 @@ export default function GoalTracker() {
         </ul>
       )}
 
+<<<<<<< HEAD
       {lastUpdated && (
         <p className="text-xs text-[var(--muted-foreground)] mt-2 text-right">
           {minutesAgo === 0 ? "Updated just now" : `Updated ${minutesAgo} min ago`}
@@ -466,6 +558,20 @@ export default function GoalTracker() {
         <div>
           <label htmlFor="goal-title" className="mb-1 block text-xs font-medium uppercase tracking-wide text-[var(--muted-foreground)]">
             Goal title
+=======
+      <form
+        onSubmit={handleCreate}
+        className="mt-6 space-y-3 border-t border-[var(--border)] pt-4"
+        aria-label="Add a new weekly goal"
+        noValidate
+      >
+        <div>
+          <label
+            htmlFor="goal-label"
+            className="mb-1 block text-xs font-medium uppercase tracking-wide text-[var(--muted-foreground)]"
+          >
+            Goal label
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
           </label>
           <input
             id="goal-title"
@@ -475,9 +581,15 @@ export default function GoalTracker() {
             placeholder="Make 10 commits"
             required
             disabled={creating}
-            className="w-full rounded-lg border border-[var(--border)] bg-[var(--background)] px-3 py-2 text-sm text-[var(--foreground)] outline-none transition placeholder:text-[var(--muted-foreground)] focus:border-[var(--accent)]"
+            aria-required="true"
+            aria-describedby="goal-label-hint"
+            className="w-full rounded-lg border border-[var(--border)] bg-[var(--background)] px-3 py-2 text-sm text-[var(--foreground)] outline-none transition placeholder:text-[var(--muted-foreground)] focus:border-[var(--accent)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-[var(--accent)]"
           />
+          <p id="goal-label-hint" className="sr-only">
+            Enter a short description for your goal, up to 100 characters.
+          </p>
         </div>
+<<<<<<< HEAD
 
         <div className="flex gap-3">
           <div className="flex-1">
@@ -513,6 +625,30 @@ export default function GoalTracker() {
               <option value="language">Lines of Code</option>
             </select>
           </div>
+=======
+        <div>
+          <label
+            htmlFor="goal-target"
+            className="mb-1 block text-xs font-medium uppercase tracking-wide text-[var(--muted-foreground)]"
+          >
+            Weekly target (days)
+          </label>
+          <input
+            id="goal-target"
+            type="number"
+            min={1}
+            max={365}
+            value={target}
+            onChange={(event) => setTarget(Number(event.target.value))}
+            disabled={creating}
+            aria-required="true"
+            aria-describedby="goal-target-hint"
+            className="w-full rounded-lg border border-[var(--border)] bg-[var(--background)] px-3 py-2 text-sm text-[var(--foreground)] outline-none transition focus:border-[var(--accent)] focus-visible:outline focus-visible:outline-2 focus-visible:outline-[var(--accent)]"
+          />
+          <p id="goal-target-hint" className="sr-only">
+            Enter a number between 1 and 365 for how many days per week to target.
+          </p>
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
         </div>
 
         {/* Deadline Picker for one-time goals */}
@@ -570,12 +706,22 @@ export default function GoalTracker() {
 
         <button
           type="submit"
+<<<<<<< HEAD
           disabled={creating || !title.trim()}
           className="inline-flex items-center gap-2 rounded-lg bg-[var(--accent)] px-4 py-2 text-sm font-medium text-[var(--accent-foreground)] transition hover:opacity-90 disabled:cursor-not-allowed disabled:opacity-60"
+=======
+          disabled={creating || !label.trim()}
+          aria-disabled={creating || !label.trim()}
+          aria-busy={creating}
+          className="inline-flex items-center gap-2 rounded-lg bg-[var(--accent)] px-4 py-2 text-sm font-medium text-white transition hover:opacity-90 disabled:cursor-not-allowed disabled:opacity-60"
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
         >
           {creating ? (
             <>
-              <span className="h-3.5 w-3.5 animate-spin rounded-full border-2 border-white/30 border-t-white" />
+              <span
+                className="h-3.5 w-3.5 animate-spin rounded-full border-2 border-white/30 border-t-white"
+                aria-hidden="true"
+              />
               Creating...
             </>
           ) : (
@@ -586,7 +732,7 @@ export default function GoalTracker() {
           <p className="text-sm text-[var(--destructive)]">{createError}</p>
         )}
       </form>
-    </div>
+    </section>
   );
 }
 
diff --git a/src/components/LanguageBreakdown.tsx b/src/components/LanguageBreakdown.tsx
index 91a408f58..de98a401f 100644
--- a/src/components/LanguageBreakdown.tsx
+++ b/src/components/LanguageBreakdown.tsx
@@ -83,13 +83,20 @@ export default function LanguageBreakdown() {
   }
 
   return (
-    <div className="rounded-xl border border-[var(--border)] bg-[var(--card)] p-6 shadow-sm">
-      <h2 className="text-lg font-semibold text-[var(--card-foreground)] mb-4">
+    <section
+      aria-labelledby="language-breakdown-heading"
+      className="rounded-xl border border-[var(--border)] bg-[var(--card)] p-6 shadow-sm"
+    >
+      <h2
+        id="language-breakdown-heading"
+        className="text-lg font-semibold text-[var(--card-foreground)] mb-4"
+      >
         Language Breakdown
       </h2>
 
       {loading ? (
         <div
+<<<<<<< HEAD
           role="status"
           aria-live="polite"
           aria-busy="true"
@@ -101,6 +108,14 @@ export default function LanguageBreakdown() {
             className="h-6 rounded-full bg-[var(--card-muted)] animate-pulse"
           />
           <div aria-hidden="true" className="grid grid-cols-1 sm:grid-cols-2 gap-2 mt-3">
+=======
+          className="space-y-3"
+          role="status"
+          aria-label="Loading language breakdown"
+        >
+          <div className="h-6 rounded-full bg-[var(--card-muted)] animate-pulse" />
+          <div className="grid grid-cols-2 gap-2 mt-3">
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
             {[1, 2, 3, 4].map((i) => (
               <div key={i} className="h-5 rounded bg-[var(--card-muted)] animate-pulse" />
             ))}
@@ -111,14 +126,24 @@ export default function LanguageBreakdown() {
           {error}
         </p>
       ) : languages.length === 0 ? (
-        <p className="text-sm text-[var(--muted-foreground)]">
+        <p className="text-sm text-[var(--muted-foreground)]" role="status">
           No language data available.
         </p>
       ) : (
         <>
+<<<<<<< HEAD
           {/* Stacked bar */}
           <div className="flex h-6 w-full overflow-hidden rounded-full bg-[var(--control)]">
             {displayLanguages.map((lang) => (
+=======
+          {/* Stacked bar — decorative; described by the list below */}
+          <div
+            className="flex h-6 w-full overflow-hidden rounded-full bg-[var(--control)]"
+            aria-hidden="true"
+            role="presentation"
+          >
+            {languages.map((lang) => (
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
               <div
                 key={lang.name}
                 className="h-full transition-all duration-500 first:rounded-l-full last:rounded-r-full"
@@ -127,11 +152,11 @@ export default function LanguageBreakdown() {
                   backgroundColor: lang.name === "Other" ? "var(--control)" : getColor(lang.name),
                   minWidth: lang.percentage > 0 ? "4px" : "0px",
                 }}
-                title={`${lang.name}: ${lang.percentage}%`}
               />
             ))}
           </div>
 
+<<<<<<< HEAD
           {/* Legend */}
           <div className="mt-4 grid grid-cols-1 sm:grid-cols-2 gap-x-4 gap-y-2">
             {displayLanguages.map((lang) => (
@@ -139,18 +164,34 @@ export default function LanguageBreakdown() {
                 <LanguageDot 
                   color={lang.name === "Other" ? "var(--control)" : getColor(lang.name)}
                   label={`${lang.name}: ${lang.percentage}%`}
+=======
+          {/* Accessible legend */}
+          <ul
+            className="mt-4 grid grid-cols-2 gap-x-4 gap-y-2"
+            aria-label="Language usage percentages"
+          >
+            {languages.map((lang) => (
+              <li key={lang.name} className="flex items-center gap-2 text-sm">
+                <span
+                  className="inline-block h-3 w-3 shrink-0 rounded-full"
+                  style={{ backgroundColor: getColor(lang.name) }}
+                  aria-hidden="true"
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
                 />
                 <span className="truncate text-[var(--card-foreground)]">
                   {lang.name}
                 </span>
-                <span className="ml-auto shrink-0 text-[var(--muted-foreground)]">
+                <span
+                  className="ml-auto shrink-0 text-[var(--muted-foreground)]"
+                  aria-label={`${lang.percentage} percent`}
+                >
                   {lang.percentage}%
                 </span>
-              </div>
+              </li>
             ))}
-          </div>
+          </ul>
         </>
       )}
-    </div>
+    </section>
   );
-}
+}
\ No newline at end of file
diff --git a/src/components/PRMetrics.tsx b/src/components/PRMetrics.tsx
index 2205328fb..eaac7a2f9 100644
--- a/src/components/PRMetrics.tsx
+++ b/src/components/PRMetrics.tsx
@@ -65,6 +65,7 @@ export default function PRMetrics() {
     setLoading(true);
     setError(null);
 
+<<<<<<< HEAD
     const params = new URLSearchParams({
       staleThresholdDays: String(staleThresholdDays),
     });
@@ -84,6 +85,16 @@ export default function PRMetrics() {
         setMinutesAgo(0);
       })
       .catch(() => setError("We couldn't load your PR analytics right now. Please try again in a moment."))
+=======
+    fetch("/api/metrics/prs")
+      .then((r) => r.json())
+      .then((data: PRData) => setMetrics(data))
+      .catch(() =>
+        setError(
+          "We couldn't load your PR analytics right now. Please try again in a moment."
+        )
+      )
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
       .finally(() => setLoading(false));
   }, [selectedAccount, staleThresholdDays]);
 
@@ -91,6 +102,7 @@ export default function PRMetrics() {
     fetchMetrics();
   }, [fetchMetrics]);
 
+<<<<<<< HEAD
   useEffect(() => {
     if (!lastUpdated) {
       return;
@@ -150,6 +162,15 @@ export default function PRMetrics() {
         },
         { includeStale: true }
       )
+=======
+  const stats = metrics
+    ? [
+        { label: "Open PRs", value: metrics.open, description: `${metrics.open} open pull requests` },
+        { label: "Merged (30d)", value: metrics.merged, description: `${metrics.merged} pull requests merged in the last 30 days` },
+        { label: "Avg Review Time", value: `${metrics.avgReviewHours}h`, description: `Average review time of ${metrics.avgReviewHours} hours` },
+        { label: "Merge Rate", value: metrics.mergeRate, description: `Merge rate of ${metrics.mergeRate}` },
+      ]
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
     : [];
 
   const gitlabStats = metrics?.gitlab
@@ -202,6 +223,7 @@ export default function PRMetrics() {
   };
 
   return (
+<<<<<<< HEAD
     <div className="rounded-xl border border-[var(--border)] bg-[var(--card)] p-6 shadow-sm">
       <div className="mb-4 flex flex-col gap-3 lg:flex-row lg:items-center lg:justify-between">
         <SectionHeader title="PR Analytics" />
@@ -267,15 +289,52 @@ export default function PRMetrics() {
         </div>
       ) : error ? (
         <div className="rounded-lg border border-[var(--destructive-muted-border)] bg-[var(--destructive-muted)] p-4 text-sm text-[var(--destructive)]">
+=======
+    <section
+      aria-labelledby="pr-analytics-heading"
+      className="rounded-xl border border-[var(--border)] bg-[var(--card)] p-6 shadow-sm"
+    >
+      <h2
+        id="pr-analytics-heading"
+        className="mb-4 text-lg font-semibold text-[var(--card-foreground)]"
+      >
+        PR Analytics
+      </h2>
+
+      {loading ? (
+        <div
+          className="grid grid-cols-2 md:grid-cols-4 gap-4"
+          role="status"
+          aria-label="Loading PR analytics"
+        >
+          {[1, 2, 3, 4].map((i) => (
+            <div
+              key={i}
+              className="h-20 rounded-lg bg-[var(--card-muted)] p-4 animate-pulse"
+            />
+          ))}
+        </div>
+      ) : error ? (
+        <div
+          role="alert"
+          className="rounded-lg border border-red-500/20 bg-red-500/10 p-4 text-sm text-red-400"
+        >
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
           <p>{error}</p>
           <button
             type="button"
             onClick={fetchMetrics}
+<<<<<<< HEAD
             className="mt-3 rounded-md border border-[var(--destructive-muted-border)] px-3 py-1.5 text-xs font-medium text-[var(--destructive)] transition-colors hover:bg-[var(--destructive-muted)]"
+=======
+            aria-label="Retry loading PR analytics"
+            className="mt-3 rounded-md border border-red-500/30 px-3 py-1.5 text-xs font-medium text-red-300 transition-colors hover:bg-red-500/10"
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
           >
             Try again
           </button>
         </div>
+<<<<<<< HEAD
       ) : activeTab === "authored" ? (
         <div className="space-y-6">
           <div>
@@ -392,7 +451,28 @@ export default function PRMetrics() {
         <p className="text-xs text-[var(--muted-foreground)] mt-2 text-right">
           {minutesAgo === 0 ? "Updated just now" : `Updated ${minutesAgo} min ago`}
         </p>
+=======
+      ) : (
+        <dl className="grid grid-cols-2 md:grid-cols-4 gap-4">
+          {stats.map((stat) => (
+            <div
+              key={stat.label}
+              className="rounded-lg bg-[var(--control)] p-4 text-center"
+            >
+              <dt className="mt-1 text-sm text-[var(--muted-foreground)]">
+                {stat.label}
+              </dt>
+              <dd
+                className="text-2xl font-bold text-[var(--accent)]"
+                aria-label={stat.description}
+              >
+                {stat.value}
+              </dd>
+            </div>
+          ))}
+        </dl>
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
       )}
-    </div>
+    </section>
   );
 }
\ No newline at end of file
diff --git a/src/components/SignOutButton.tsx b/src/components/SignOutButton.tsx
index 2d5ef18e5..a25533f33 100644
--- a/src/components/SignOutButton.tsx
+++ b/src/components/SignOutButton.tsx
@@ -4,6 +4,7 @@ import { useState } from "react"
 import { signOut } from "next-auth/react"
 
 export default function SignOutButton() {
+<<<<<<< HEAD
     const [signingOut, setSigningOut] = useState(false)
     const [confirming, setConfirming] = useState(false)
 
@@ -16,8 +17,21 @@ export default function SignOutButton() {
             console.error("Sign out error:", error)
             setSigningOut(false)
         }
+=======
+  const [signingOut, setSigningOut] = useState(false)
+
+  const handleSignOut = async () => {
+    setSigningOut(true)
+    try {
+      await signOut({ callbackUrl: "/" })
+    } catch (error) {
+      console.error("Sign out error:", error)
+      setSigningOut(false)
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
     }
+  }
 
+<<<<<<< HEAD
     if (confirming) {
         return (
             <div className="flex items-center gap-2">
@@ -83,3 +97,43 @@ export default function SignOutButton() {
         </button>
     )
 }
+=======
+  return (
+    <button
+      type="button"
+      disabled={signingOut}
+      aria-disabled={signingOut}
+      aria-busy={signingOut}
+      aria-label={signingOut ? "Signing out, please wait" : "Sign out of DevTrack"}
+      onClick={handleSignOut}
+      className="flex items-center gap-2 rounded-full border border-red-600/50 bg-red-600/80 px-4 py-2 font-semibold text-white transition-colors hover:bg-red-600 disabled:cursor-not-allowed disabled:opacity-70"
+    >
+      {signingOut && (
+        <svg
+          className="h-4 w-4 animate-spin text-white"
+          xmlns="http://www.w3.org/2000/svg"
+          fill="none"
+          viewBox="0 0 24 24"
+          aria-hidden="true"
+          focusable="false"
+        >
+          <circle
+            className="opacity-25"
+            cx="12"
+            cy="12"
+            r="10"
+            stroke="currentColor"
+            strokeWidth="4"
+          />
+          <path
+            className="opacity-75"
+            fill="currentColor"
+            d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+          />
+        </svg>
+      )}
+      {signingOut ? "Signing out..." : "Sign out"}
+    </button>
+  )
+}
+>>>>>>> 393b334 (fix: add keyboard navigation and ARIA labels for accessibility (closes #1308))
diff --git a/supabase/migrations/20260515000000_add_streak_freezes.sql b/supabase/migrations/20260515000000_add_streak_freezes.sql
index b5db5b902..d49d2d92e 100644
--- a/supabase/migrations/20260515000000_add_streak_freezes.sql
+++ b/supabase/migrations/20260515000000_add_streak_freezes.sql
@@ -1,10 +1,15 @@
 -- Migration: add streak_freezes table
+<<<<<<< HEAD
 -- Allows users to protect one streak day (e.g. weekends, sick days)
+=======
+-- Allows users to protect one streak day 
+>>>>>>> 1337d90 (feat: add streak freeze feature (#37))
 
 create table if not exists streak_freezes (
   id          text primary key default gen_random_uuid()::text,
   user_id     text not null references users(id) on delete cascade,
   freeze_date date not null,
+<<<<<<< HEAD
   created_at  timestamptz default now()
 );
 
@@ -12,3 +17,10 @@ create index if not exists streak_freezes_user on streak_freezes(user_id);
 
 create unique index if not exists streak_freezes_user_date_uniq
   on streak_freezes(user_id, freeze_date);
+=======
+  used_at     timestamptz default now()
+);
+
+create index if not exists streak_freezes_user on streak_freezes(user_id);
+create index if not exists streak_freezes_user_date on streak_freezes(user_id, freeze_date);
+>>>>>>> 1337d90 (feat: add streak freeze feature (#37))