Update readme.
Fix conflict