Document the refactor-vs-semantics merge resolution pattern (port the upstream semantic change into the extracted helper, never pick a side) and the parallel-bootstrap CONCEPTS.md add/add union, with the FN-5902 / runFeatureValidation merge as the worked example. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>