Text view now displays text
Merge