Fix conflicts in ToggleGear