fixed the user flow
merge conflict