FS-5003 --resolve

Conflicts:
	src/switch_ivr_bridge.c