fixed conflict in readme
authorWilliam Chang <william@factual.com>
Fri, 10 May 2019 23:44:13 +0000 (16:44 -0700)
committerWilliam Chang <william@factual.com>
Fri, 10 May 2019 23:44:13 +0000 (16:44 -0700)

Trivial merge