- fix merge text