update Readme
resolve conflict