Fix merge
Fix merge
add Delete User