A merge commit stages every file brought in from the other branch, so
lint-staged's oxlint --fix rewrote incoming code that main had not
autofixed (duplicate imports and similar fixable warnings), putting
unrelated changes into PR merges and causing new conflicts with main.
Conflict resolutions are still checked by the pre-push hook and CI.