conflict fix

resolved merge conflict with phone button