Fixed merge
Merge branch 'feature/delete_confirmation'