flash message corrected
merge ok
fix flash message