renamed ButtonState to not override version in master on merge