for user story 2020 scenario 3
Merge remote-tracking branch 'origin/master'