small fix on README file
resolve conflict