fix the readme file
fix in master
resolve merge conflict