# Conflicts: # bun.lock # packages/ui/src/components/chat/message/normalizeUserDisplayParts.ts # packages/ui/src/components/chat/work-status/WorkStatusPrimaryGroup.tsx # packages/ui/src/components/layout/ContextPanelRail.tsx # packages/ui/src/hooks/useKeyboardShortcuts.ts # packages/ui/src/lib/i18n/messages/de.ts # packages/ui/src/lib/surfaces/DOCUMENTATION.md # packages/web/server/lib/fs/routes.test.js