Improve the README file
Resolve conflict