Merged log brok alerts and other alerts + fixed #6