resolve trivial merge conflict in readme