update delete function
update delete function
Merge branch 'logic'
resolve merge conflicts