adding fade alerts
conflict merging