Merge "button state"