fixed merge text