Only the bilingual pairing records conflicted. Master moved Agent Note records to per-heading hashes, so this branch's note record was re-recorded in that format; the ui-primitives and ui-theme README records were re-recorded unchanged. The stylesheet corpus spec still passes over master's new client sheets, so no ring needed realigning this time.