(fix merge conflict before a new try of "Big assorted spelling fixes")

No functional change. by Richard Lloyd