text issue
merge