fix merge conflict in README.md

This commit is contained in:
David Thompson
2020-05-26 00:31:18 -04:00