diff --git a/src/App.tsx b/src/App.tsx
index db80929..dedcc90 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -19,11 +19,7 @@ export default function App() {
   const [activePeriod, setActivePeriod] = useState<string>('22-May-26');
   const [priorPeriod, setPriorPeriod] = useState<string>('15-May-26');
   const [periodsList, setPeriodsList] = useState<string[]>(['22-May-26', '15-May-26', '08-May-26', '01-May-26']);
-<<<<<<< HEAD
-  const [themeMode, setThemeMode] = useState<HolographicThemeMode>('amber');
-=======
   const [themeMode, setThemeMode] = useState<HolographicThemeMode>(() => (localStorage.getItem('app_theme_mode') as HolographicThemeMode) || 'amber');
->>>>>>> cea0aea (Commit v0.2)
   const [isAuthModalOpen, setIsAuthModalOpen] = useState<boolean>(false);
   const [verificationNotice, setVerificationNotice] = useState<string | null>(null);