fix conflict from a previous commit
Merge branch 'master' of github.com:globalresiliencepartnership/globalresiliencepartnership.github.io