Update text
Merge changes