blocks: fix reset order
Merge branch 'develop' of git@github.com:nukeviet/nukeviet.git into develop