add update text
Merge conflicts