fix send text logic
merge