delete action
Merge branch 'delete_action'