updated leads and flash messages
fixed merge conflict