Add conflict resolution diff UI and app branding

apps/web/src/app.tsx

@@ -339,7 +339,10 @@ function WorkspaceView(props: {
       <section class="column-browser" aria-label="Workspace files">
         {columns.map((column) => (
           <div class="browser-column" key={column.prefix || "root"}>
-            <header>{column.title}</header>
+            <header>
+              <Folder size={15} />
+              {column.title}
+            </header>
             <div class="item-list">
               {column.items.map((item) => (
                 <button

apps/web/src/main.tsx

@@ -4,7 +4,7 @@ import { App } from "./app";
 import "./styles.css";
 
 render(
-  <LocationProvider>
+  <LocationProvider scope="/app">
     <Router>{[<Route path="/*" component={App} />]}</Router>
   </LocationProvider>,
   document.getElementById("app")!,