Adds alerts.
Resolves merge conflicts.