flash messages fix
merge fail fix