README: cleanup merge conflict