Feature/combine alerts into broadcast alert