# Conflicts: # nix/package.nix # packages/app/src/screens/settings-screen.tsx # packages/server/src/server/session.workspace-git-watch.test.ts # packages/server/src/server/session.workspaces.test.ts
# Conflicts: # nix/package.nix # packages/app/src/screens/settings-screen.tsx # packages/server/src/server/session.workspace-git-watch.test.ts # packages/server/src/server/session.workspaces.test.ts