projects/ userstories adjustments in comments/member/
conflict 1
merged codes