adding more text
fixed merge of text changes