edit the  delete activity functionality
resolve confict