Correct at least one of the merge problems [Fixes #60332774].