changed some text
merge