updating toggle actions
update merge conflict