add buttons
merge branch