Changed:readme.md
Changed:resolve confict