r23174: merge text