更新README
Fix conflicts