Conflict in ingestion/internal/brainfs/brainfs_test.go only: both sides appended a test after TestReadRegularNeverReturnsAnInBrainFileSwappedInBehindASymlink (this branch: TestWriteRegularRefusesFinalSymlinksFIFOsEscapesAndMissingFilesAndRewritesRegularFiles; main: TestReadDirDirsListsOnlyRealSubdirsAndRefusesSymlinkedComponents). Kept both, unchanged. No production code touched by the resolution. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>