add deactivate for rollback
merge ok