Telephony: fix merge