adding attached files for user stories
merging and resolving conflicts