button text
merge problems