added in buttons
fixed merges