fix readme merge conflict from #85