10d3517648
The auto-resolver kept both sides of the conflict — feature's _project_root signature with master's filesystem code referencing project_root — producing a compile error. Remove the filesystem fallback on master so there's no conflict. CRDT is the only source of truth. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>