diff --git a/packages/ui/src/stores/useProjectsStore.ts b/packages/ui/src/stores/useProjectsStore.ts
index 83f618b0..f7398967 100644
--- a/packages/ui/src/stores/useProjectsStore.ts
+++ b/packages/ui/src/stores/useProjectsStore.ts
@@ -49,12 +49,8 @@ interface ProjectsStore {
   activeProjectId: string | null;
   manualProjectOrder: string[];
 
-<<<<<<< HEAD
   addProject: (path: string, options?: { label?: string; id?: string }) => Promise<ProjectEntry | null>;
-=======
-  addProject: (path: string, options?: { label?: string; id?: string }) => ProjectEntry | null;
   addProjects: (paths: string[]) => ProjectEntry[];
->>>>>>> e7506d349 (feat(projects): support adding multiple projects at once in the directory picker)
   removeProject: (id: string) => void;
   setActiveProject: (id: string) => void;
   setActiveProjectIdOnly: (id: string) => void;