Change readme.md
resove conflicts