re merge new text !!