Update readme.
resolve merge conflict