fix readme after merge conflict