All delete and replace
Modify README
remove conflict file