updated sample flow
updated sample flow
updated sample flow
fix merge conflict