modified user_stories show
merge and resolving conflicts for db/schema and projects view