update user stories and data planning
merge conflict resolved