delete a phone
fixed merge conflict