logout flow working
merging