changed some text
merge something