update text
merge