fix up merge and add bun.lockb to gitignore

interface/src/App.tsx

@@ -24,6 +24,7 @@ const App: React.FC = () => {
     }
   ];
 
+  {/* <div className="flex justify-center w-screen h-screen pt-4 overflow-hidden" style={{ background: settingsState.customThemeColor }}> */}
   return (
     <SettingsContextProvider>
       <div className="flex flex-col w-[384px] shadow-2xl gap-2 bg-white rounded-xl h-[590px] dark:bg-zinc-800 dark:text-white">

interface/src/main.tsx

@@ -3,7 +3,9 @@ import ReactDOM from 'react-dom/client'
 import App from './App.js'
 import './index.css'
 
-ReactDOM.createRoot(document.getElementById('ExtensionPopup')!).render(
+const root = ReactDOM.createRoot(document.getElementById('ExtensionPopup')!);
+
+root.render(
   <React.StrictMode>
     <App />
   </React.StrictMode>,