changed button text
merge