fixed phone bug
fixed merge conflict