implemented email delivery for user deletion
resolve merge conflict & merge in master