onoff toggle styled
fixing merge conflict