merged, alerts fixed, alert counter fixed