Update readme
Fix conflict