add flash alert
merge