Added conflict alerts.