Merging some text changes