adding user stories to project
merging and solving conflicts