added flash messages
added flash message to passwords
resolved conflict