Edit Button for deleting
Merge remote-tracking branch 'origin/master'
merge and add edit