Conflicts: daemon/call.c daemon/call_interfaces.c daemon/main.c daemon/media_socket.c daemon/redis.c daemon/redis.h