🤖 Remove git conflict markers from ProjectSidebar

Author: kylecarbs

src/components/ProjectSidebar.tsx

@@ -424,45 +424,6 @@ const ProjectSidebarInner: React.FC<ProjectSidebarProps> = ({
     <RenameProvider onRenameWorkspace={onRenameWorkspace}>
       <DndProvider backend={HTML5Backend}>
         <ProjectDragLayer />
-<<<<<<< HEAD
-        <SidebarContent role="navigation" aria-label="Projects">
-          {!collapsed && (
-            <>
-              <SidebarHeader>
-                <h2>Projects</h2>
-                <TooltipWrapper inline>
-                  <AddProjectBtn onClick={onAddProject} aria-label="Add project">
-                    +
-                  </AddProjectBtn>
-                  <Tooltip className="tooltip" align="right">
-                    Add Project
-                  </Tooltip>
-                </TooltipWrapper>
-              </SidebarHeader>
-              <ProjectsList>
-=======
-        <div
-          className="flex flex-col flex-1 overflow-hidden font-primary"
-          role="navigation"
-          aria-label="Projects"
-        >
-          {!collapsed && (
-            <>
-              <div className="flex justify-between items-center p-4 border-b border-[#1e1e1e]">
-                <h2 className="m-0 text-[13px] font-semibold text-[#cccccc] uppercase tracking-[0.8px]">
-                  Projects
-                </h2>
-                <button
-                  onClick={onAddProject}
-                  title="Add Project"
-                  aria-label="Add project"
-                  className="w-6 h-6 bg-transparent text-[#cccccc] border border-transparent rounded cursor-pointer text-lg flex items-center justify-center p-0 transition-all duration-200 hover:bg-[#2a2a2b] hover:border-[#3c3c3c]"
-                >
-                  +
-                </button>
-              </div>
-              <div className="flex-1 overflow-y-auto">
->>>>>>> 6778c48 (🤖 fix: Restore properly converted Tailwind files after rebase)
                 {projects.size === 0 ? (
                   <EmptyState>
                     <p>No projects</p>
@@ -601,28 +562,6 @@ const ProjectSidebarInner: React.FC<ProjectSidebarProps> = ({
                                       >
                                         <div className="label">
                                           <span>Older than {formatOldWorkspaceThreshold()}</span>
-<<<<<<< HEAD
-                                          <span className="count">({old.length})</span>
-                                        </div>
-                                        <span className="arrow">▶</span>
-                                      </OldWorkspacesSection>
-=======
-                                          <span className="text-[#666] font-normal">
-                                            ({old.length})
-                                          </span>
-                                        </div>
-                                        <span
-                                          className="arrow text-[11px] text-[#666] transition-transform duration-200 ease-in-out"
-                                          style={{
-                                            transform: showOldWorkspaces
-                                              ? "rotate(90deg)"
-                                              : "rotate(0deg)",
-                                          }}
-                                        >
-                                          ▶
-                                        </span>
-                                      </button>
->>>>>>> 6778c48 (🤖 fix: Restore properly converted Tailwind files after rebase)
                                       {showOldWorkspaces && old.map(renderWorkspace)}
                                     </>
                                   )}