Fixed er-diagram.yml
Merge branch 'master' into Issue-17-20
Merge branch 'Issue-17-20'