for user story 2022 scenario 2
Merge remote-tracking branch 'origin/master'