fix detaul
fix tel phone
fix merge