Update readme after merge conflict