add toggle
merge