adding voice message
fixing conflicts